Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/run/src/G4Run.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 /run/src/G4Run.cc (Version 11.3.0) and /run/src/G4Run.cc (Version 10.4)


  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 // G4Run implementation                        << 
 27 //                                                 26 //
 28 // Author: M.Asai, 1996                        <<  27 // $Id: G4Run.cc 70225 2013-05-27 10:10:15Z gcosmo $
 29 // ------------------------------------------- <<  28 //
 30                                                    29 
 31 #include "G4Run.hh"                                30 #include "G4Run.hh"
 32                                                << 
 33 #include "G4Event.hh"                              31 #include "G4Event.hh"
 34 #include "G4RunManager.hh"                         32 #include "G4RunManager.hh"
 35 #include "G4StatAnalysis.hh"                   << 
 36                                                    33 
 37 // ------------------------------------------- << 
 38 G4Run::G4Run()                                     34 G4Run::G4Run()
 39 {                                              <<  35 :runID(0),numberOfEvent(0),numberOfEventToBeProcessed(0),HCtable(0),DCtable(0)
 40   eventVector = new std::vector<const G4Event* <<  36 { eventVector = new std::vector<const G4Event*>; }
 41   G4StatAnalysis::ResetCpuClock();  // this is << 
 42 }                                              << 
 43                                                    37 
 44 // ------------------------------------------- << 
 45 G4Run::~G4Run()                                    38 G4Run::~G4Run()
 46 {                                                  39 {
 47   if(G4RunManager::GetRunManager()->GetRunMana <<  40   // Objects made by local thread should not be deleted by the master thread
                                                   >>  41   G4RunManager::RMType rmType = G4RunManager::GetRunManager()->GetRunManagerType();
                                                   >>  42   if(rmType != G4RunManager::masterRM)
 48   {                                                43   {
 49     for(auto& itr : *eventVector)              <<  44     std::vector<const G4Event*>::iterator itr = eventVector->begin();
 50     {                                          <<  45     for(;itr!=eventVector->end();itr++)
 51       G4RunManager::GetRunManager()->ReportEve <<  46     { delete *itr; }
 52       delete itr;                              << 
 53     }                                          << 
 54   }                                                47   }
 55   delete eventVector;                              48   delete eventVector;
 56 }                                                  49 }
 57                                                    50 
 58 // ------------------------------------------- << 
 59 void G4Run::RecordEvent(const G4Event*)            51 void G4Run::RecordEvent(const G4Event*)
 60 {                                              <<  52 { numberOfEvent++; }
 61   ++numberOfEvent;                             << 
 62 }                                              << 
 63                                                    53 
 64 // ------------------------------------------- << 
 65 void G4Run::Merge(const G4Run* right)              54 void G4Run::Merge(const G4Run* right)
 66 {                                                  55 {
 67   numberOfEvent += right->numberOfEvent;       <<  56   numberOfEvent += right->numberOfEvent; 
 68   for(auto& itr : *(right->eventVector))       <<  57   std::vector<const G4Event*>::iterator itr = right->eventVector->begin();
 69   { eventVector->push_back(itr); }             <<  58   for(;itr!=right->eventVector->end();itr++)
                                                   >>  59   { eventVector->push_back(*itr); }
 70 }                                                  60 }
 71                                                    61 
 72 // ------------------------------------------- << 
 73 void G4Run::StoreEvent(G4Event* evt)               62 void G4Run::StoreEvent(G4Event* evt)
 74 {                                              <<  63 { eventVector->push_back(evt); }
 75   eventVector->push_back(evt);                 << 
 76 }                                              << 
 77                                                << 
 78 // ------------------------------------------- << 
 79 G4int G4Run::GetNumberOfKeptEvents() const     << 
 80 {                                              << 
 81   G4int n = 0;                                 << 
 82   if(eventVector!=nullptr && eventVector->size << 
 83   {                                            << 
 84     for(auto& ev : *eventVector)               << 
 85     { if(ev->KeepTheEventFlag()) n++; }        << 
 86   }                                            << 
 87   return n;                                    << 
 88 }                                              << 
 89                                                << 
 90 // ------------------------------------------- << 
 91 void G4Run::MergeSubEvent(G4Event* /*masterEv* << 
 92 {                                              << 
 93  // trajectories are merged here.......        << 
 94  ;                                             << 
 95 }                                              << 
 96                                                    64 
 97                                                    65