Import Geant4 10.0.0 source tree

source/run/src/G4Run.cc

@@ -24,11 +24,12 @@
 // ********************************************************************
 //
 //
-// $Id$
+// $Id: G4Run.cc 70225 2013-05-27 10:10:15Z gcosmo $
 //
 
 #include "G4Run.hh"
 #include "G4Event.hh"
+#include "G4RunManager.hh"
 
 G4Run::G4Run()
 :runID(0),numberOfEvent(0),numberOfEventToBeProcessed(0),HCtable(0),DCtable(0)
@@ -36,15 +37,28 @@ G4Run::G4Run()
 
 G4Run::~G4Run()
 {
-  std::vector<const G4Event*>::iterator itr = eventVector->begin();
-  for(;itr!=eventVector->end();itr++)
-  { delete *itr; }
+  // Objects made by local thread should not be deleted by the master thread
+  G4RunManager::RMType rmType = G4RunManager::GetRunManager()->GetRunManagerType();
+  if(rmType != G4RunManager::masterRM)
+  {
+    std::vector<const G4Event*>::iterator itr = eventVector->begin();
+    for(;itr!=eventVector->end();itr++)
+    { delete *itr; }
+  }
   delete eventVector;
 }
 
 void G4Run::RecordEvent(const G4Event*)
 { numberOfEvent++; }
 
+void G4Run::Merge(const G4Run* right)
+{
+  numberOfEvent += right->numberOfEvent; 
+  std::vector<const G4Event*>::iterator itr = right->eventVector->begin();
+  for(;itr!=right->eventVector->end();itr++)
+  { eventVector->push_back(*itr); }
+}
+
 void G4Run::StoreEvent(G4Event* evt)
 { eventVector->push_back(evt); }