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