Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/electromagnetic/TestEm5/src/RunAction.cc

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/TestEm5/src/RunAction.cc (Version 11.3.0) and /examples/extended/electromagnetic/TestEm5/src/RunAction.cc (Version 10.1.p3)


  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/TestEm5/src/RunActio     26 /// \file electromagnetic/TestEm5/src/RunAction.cc
 27 /// \brief Implementation of the RunAction cla     27 /// \brief Implementation of the RunAction class
 28 //                                                 28 //
                                                   >>  29 // $Id: RunAction.cc 78394 2013-12-16 16:35:20Z gcosmo $
 29 //                                                 30 //
 30 //....oooOO0OOooo........oooOO0OOooo........oo     31 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 31 //....oooOO0OOooo........oooOO0OOooo........oo     32 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 32                                                    33 
 33 #include "RunAction.hh"                            34 #include "RunAction.hh"
 34                                                << 
 35 #include "DetectorConstruction.hh"                 35 #include "DetectorConstruction.hh"
 36 #include "HistoManager.hh"                     << 
 37 #include "PrimaryGeneratorAction.hh"               36 #include "PrimaryGeneratorAction.hh"
                                                   >>  37 #include "HistoManager.hh"
 38 #include "Run.hh"                                  38 #include "Run.hh"
 39                                                    39 
 40 #include "G4EmCalculator.hh"                   << 
 41 #include "G4Run.hh"                                40 #include "G4Run.hh"
 42 #include "G4SystemOfUnits.hh"                  <<  41 #include "G4RunManager.hh"
 43 #include "G4UnitsTable.hh"                         42 #include "G4UnitsTable.hh"
 44 #include "Randomize.hh"                        <<  43 #include "G4EmCalculator.hh"
 45                                                    44 
                                                   >>  45 #include "Randomize.hh"
                                                   >>  46 #include "G4SystemOfUnits.hh"
 46 #include <iomanip>                                 47 #include <iomanip>
 47                                                    48 
 48 //....oooOO0OOooo........oooOO0OOooo........oo     49 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 49                                                    50 
 50 RunAction::RunAction(DetectorConstruction* det     51 RunAction::RunAction(DetectorConstruction* det, PrimaryGeneratorAction* kin)
 51   : fDetector(det), fPrimary(kin)              <<  52 :G4UserRunAction(),fDetector(det), fPrimary(kin), fRun(0), fHistoManager(0)
 52 {                                              <<  53 { 
 53   // Book predefined histograms                    54   // Book predefined histograms
 54   fHistoManager = new HistoManager();              55   fHistoManager = new HistoManager();
 55 }                                                  56 }
 56                                                    57 
 57 //....oooOO0OOooo........oooOO0OOooo........oo     58 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 58                                                    59 
 59 RunAction::~RunAction()                            60 RunAction::~RunAction()
 60 {                                              <<  61 { 
 61   delete fHistoManager;                            62   delete fHistoManager;
 62 }                                                  63 }
 63                                                    64 
 64 //....oooOO0OOooo........oooOO0OOooo........oo     65 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 65                                                    66 
 66 G4Run* RunAction::GenerateRun()                    67 G4Run* RunAction::GenerateRun()
 67 {                                              <<  68 { 
 68   fRun = new Run(fDetector);                       69   fRun = new Run(fDetector);
 69   return fRun;                                     70   return fRun;
 70 }                                                  71 }
 71                                                    72 
 72 //....oooOO0OOooo........oooOO0OOooo........oo     73 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 73                                                    74 
 74 void RunAction::BeginOfRunAction(const G4Run*)     75 void RunAction::BeginOfRunAction(const G4Run*)
 75 {                                                  76 {
 76   // show Rndm status                          <<  77   // save Rndm status
                                                   >>  78   ////  G4RunManager::GetRunManager()->SetRandomNumberStore(true);
 77   if (isMaster) G4Random::showEngineStatus();      79   if (isMaster) G4Random::showEngineStatus();
 78                                                <<  80      
 79   // keep run condition                            81   // keep run condition
 80   if (fPrimary) {                              <<  82   if ( fPrimary ) { 
 81     G4ParticleDefinition* particle = fPrimary- <<  83     G4ParticleDefinition* particle 
                                                   >>  84       = fPrimary->GetParticleGun()->GetParticleDefinition();
 82     G4double energy = fPrimary->GetParticleGun     85     G4double energy = fPrimary->GetParticleGun()->GetParticleEnergy();
 83     fRun->SetPrimary(particle, energy);            86     fRun->SetPrimary(particle, energy);
 84   }                                                87   }
 85                                                <<  88   
 86   // histograms                                <<  89   //histograms
 87   //                                           <<  90   //        
 88   G4AnalysisManager* analysisManager = G4Analy     91   G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();
 89   if (analysisManager->IsActive()) {           <<  92   if ( analysisManager->IsActive() ) {
 90     analysisManager->OpenFile();                   93     analysisManager->OpenFile();
 91   }                                            <<  94   } 
 92 }                                                  95 }
 93                                                    96 
 94 //....oooOO0OOooo........oooOO0OOooo........oo     97 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 95                                                    98 
 96 void RunAction::EndOfRunAction(const G4Run*)       99 void RunAction::EndOfRunAction(const G4Run*)
 97 {                                              << 100 {  
 98   // print Run summary                            101   // print Run summary
 99   //                                              102   //
100   if (isMaster) fRun->EndOfRun();              << 103   if (isMaster) fRun->EndOfRun();    
101                                                << 104       
102   // save histograms                              105   // save histograms
103   G4AnalysisManager* analysisManager = G4Analy << 106   G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();  
104   if (analysisManager->IsActive()) {           << 107   if ( analysisManager->IsActive() ) {    
105     analysisManager->Write();                     108     analysisManager->Write();
106     analysisManager->CloseFile();                 109     analysisManager->CloseFile();
107   }                                            << 110   }  
108                                                   111 
109   // show Rndm status                             112   // show Rndm status
110   if (isMaster) G4Random::showEngineStatus();     113   if (isMaster) G4Random::showEngineStatus();
111 }                                                 114 }
112                                                   115 
113 //....oooOO0OOooo........oooOO0OOooo........oo    116 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
114                                                   117