Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/electromagnetic/TestEm2/include/Run.hh

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /examples/extended/electromagnetic/TestEm2/include/Run.hh (Version 11.3.0) and /examples/extended/electromagnetic/TestEm2/include/Run.hh (Version 10.4.p1)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                         3 // * License and Disclaimer                                           *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th      5 // * The  Geant4 software  is  copyright of the Copyright Holders  of *
  6 // * the Geant4 Collaboration.  It is provided      6 // * the Geant4 Collaboration.  It is provided  under  the terms  and *
  7 // * conditions of the Geant4 Software License      7 // * conditions of the Geant4 Software License,  included in the file *
  8 // * LICENSE and available at  http://cern.ch/      8 // * LICENSE and available at  http://cern.ch/geant4/license .  These *
  9 // * include a list of copyright holders.           9 // * include a list of copyright holders.                             *
 10 // *                                               10 // *                                                                  *
 11 // * Neither the authors of this software syst     11 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     12 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     13 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     14 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file      15 // * use.  Please see the license in the file  LICENSE  and URL above *
 16 // * for the full disclaimer and the limitatio     16 // * for the full disclaimer and the limitation of liability.         *
 17 // *                                               17 // *                                                                  *
 18 // * This  code  implementation is the result      18 // * This  code  implementation is the result of  the  scientific and *
 19 // * technical work of the GEANT4 collaboratio     19 // * technical work of the GEANT4 collaboration.                      *
 20 // * By using,  copying,  modifying or  distri     20 // * By using,  copying,  modifying or  distributing the software (or *
 21 // * any work based  on the software)  you  ag     21 // * any work based  on the software)  you  agree  to acknowledge its *
 22 // * use  in  resulting  scientific  publicati     22 // * use  in  resulting  scientific  publications,  and indicate your *
 23 // * acceptance of all terms of the Geant4 Sof     23 // * acceptance of all terms of the Geant4 Software license.          *
 24 // *******************************************     24 // ********************************************************************
 25 //                                                 25 //
 26 /// \file electromagnetic/TestEm2/include/Run.     26 /// \file electromagnetic/TestEm2/include/Run.hh
 27 /// \brief Definition of the Run class             27 /// \brief Definition of the Run class
 28 //                                                 28 //
                                                   >>  29 // $Id: Run.hh 75565 2013-11-04 11:24:11Z vnivanch $
 29 //                                                 30 //
 30 //....oooOO0OOooo........oooOO0OOooo........oo     31 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 31 //....oooOO0OOooo........oooOO0OOooo........oo     32 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 32                                                    33 
 33 #ifndef Run_h                                      34 #ifndef Run_h
 34 #define Run_h 1                                    35 #define Run_h 1
 35                                                    36 
 36 #include "DetectorConstruction.hh"             << 
 37                                                << 
 38 #include "G4AnalysisManager.hh"                << 
 39 #include "G4Run.hh"                                37 #include "G4Run.hh"
 40                                                    38 
                                                   >>  39 #include "g4root.hh"
                                                   >>  40 
 41 #include <vector>                                  41 #include <vector>
 42 typedef std::vector<G4double> MyVector;            42 typedef std::vector<G4double> MyVector;
 43                                                    43 
 44 //....oooOO0OOooo........oooOO0OOooo........oo     44 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 45                                                    45 
 46 class DetectorConstruction;                        46 class DetectorConstruction;
 47 class PrimaryGeneratorAction;                      47 class PrimaryGeneratorAction;
 48                                                    48 
 49 //....oooOO0OOooo........oooOO0OOooo........oo     49 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 50                                                    50 
 51 class Run : public G4Run                           51 class Run : public G4Run
 52 {                                                  52 {
 53   public:                                      <<  53 public:
 54     Run(DetectorConstruction*, PrimaryGenerato << 
 55     ~Run() override = default;                 << 
 56                                                << 
 57     void Merge(const G4Run*) override;         << 
 58                                                    54 
 59     void InitializePerEvent();                 <<  55   Run(DetectorConstruction*, PrimaryGeneratorAction*);
 60     void FillPerEvent();                       <<  56   virtual ~Run();
 61                                                    57 
 62     inline void FillPerTrack(G4double, G4doubl <<  58   virtual void Merge(const G4Run*);
 63     inline void FillPerStep(G4double, G4int, G << 
 64                                                    59 
 65     inline void AddStep(G4double q);           <<  60   void InitializePerEvent();
                                                   >>  61   void FillPerEvent();
 66                                                    62 
 67     void EndOfRun(G4double edep, G4double rms, <<  63   inline void FillPerTrack(G4double,G4double);
                                                   >>  64   inline void FillPerStep (G4double,G4int,G4int);
 68                                                    65 
 69     inline void SetVerbose(G4int val) { fVerbo <<  66   inline void AddStep(G4double q);
 70                                                    67 
 71   private:                                     <<  68   void EndOfRun(G4double edep, G4double rms, G4double& limit); 
 72     void Reset();                              << 
 73                                                    69 
 74     DetectorConstruction* fDet = nullptr;      <<  70   inline void SetVerbose(G4int val)  {fVerbose = val;};
 75     PrimaryGeneratorAction* fKin = nullptr;    <<  71      
                                                   >>  72 private:
                                                   >>  73   void Reset();
 76                                                    74 
 77     G4int f_nLbin = kMaxBin;                   <<  75   DetectorConstruction*   fDet;
 78     MyVector f_dEdL;                           <<  76   PrimaryGeneratorAction* fKin;
 79     MyVector fSumELongit;                      <<  77     
 80     MyVector fSumE2Longit;                     <<  78   G4int f_nLbin;
 81     MyVector fSumELongitCumul;                 <<  79   MyVector f_dEdL;
 82     MyVector fSumE2LongitCumul;                <<  80   MyVector fSumELongit;
                                                   >>  81   MyVector fSumE2Longit;
                                                   >>  82   MyVector fSumELongitCumul;
                                                   >>  83   MyVector fSumE2LongitCumul;
 83                                                    84 
 84     G4int f_nRbin = kMaxBin;                   <<  85   G4int f_nRbin;
 85     MyVector f_dEdR;                           <<  86   MyVector f_dEdR;
 86     MyVector fSumERadial;                      <<  87   MyVector fSumERadial;
 87     MyVector fSumE2Radial;                     <<  88   MyVector fSumE2Radial;
 88     MyVector fSumERadialCumul;                 <<  89   MyVector fSumERadialCumul;
 89     MyVector fSumE2RadialCumul;                <<  90   MyVector fSumE2RadialCumul;
 90                                                    91 
 91     G4double fChargTrLength = 0.;              <<  92   G4double fChargTrLength;
 92     G4double fSumChargTrLength = 0.;           <<  93   G4double fSumChargTrLength;
 93     G4double fSum2ChargTrLength = 0.;          <<  94   G4double fSum2ChargTrLength;
 94                                                    95 
 95     G4double fNeutrTrLength = 0.;              <<  96   G4double fNeutrTrLength;
 96     G4double fSumNeutrTrLength = 0.;           <<  97   G4double fSumNeutrTrLength;
 97     G4double fSum2NeutrTrLength = 0.;          <<  98   G4double fSum2NeutrTrLength;
 98                                                    99 
 99     G4double fChargedStep = 0.;                << 100   G4double fChargedStep;
100     G4double fNeutralStep = 0.;                << 101   G4double fNeutralStep;    
101                                                   102 
102     G4int fVerbose = 0;                        << 103   G4int    fVerbose;
103 };                                                104 };
104                                                   105 
105 //....oooOO0OOooo........oooOO0OOooo........oo    106 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
106                                                   107 
107 inline void Run::FillPerTrack(G4double charge, << 108 inline
                                                   >> 109 void Run::FillPerTrack(G4double charge, G4double trkLength)
108 {                                                 110 {
109   if (charge != 0.)                            << 111   if (charge != 0.) fChargTrLength += trkLength;
110     fChargTrLength += trkLength;               << 112   else              fNeutrTrLength += trkLength;   
111   else                                         << 
112     fNeutrTrLength += trkLength;               << 
113 }                                                 113 }
114                                                   114 
115 //....oooOO0OOooo........oooOO0OOooo........oo    115 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
116                                                   116 
117 inline void Run::FillPerStep(G4double dEstep,  << 117 inline
                                                   >> 118 void Run::FillPerStep(G4double dEstep, G4int Lbin, G4int Rbin)
118 {                                                 119 {
119   f_dEdL[Lbin] += dEstep;                      << 120   f_dEdL[Lbin] += dEstep; f_dEdR[Rbin] += dEstep;
120   f_dEdR[Rbin] += dEstep;                      << 
121 }                                                 121 }
122                                                   122 
123 //....oooOO0OOooo........oooOO0OOooo........oo    123 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
124                                                   124 
125 inline void Run::AddStep(G4double q)              125 inline void Run::AddStep(G4double q)
126 {                                                 126 {
127   if (q == 0.0) {                              << 127   if (q == 0.0) { fNeutralStep += 1.0; }
128     fNeutralStep += 1.0;                       << 128   else          { fChargedStep += 1.0; }  
129   }                                            << 
130   else {                                       << 
131     fChargedStep += 1.0;                       << 
132   }                                            << 
133 }                                                 129 }
134                                                << 130  
135 //....oooOO0OOooo........oooOO0OOooo........oo    131 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
136                                                   132 
137 #endif                                            133 #endif
                                                   >> 134 
138                                                   135