lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 3.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 16:03:00 +02:00
parent cfcb558cfe
commit 137e303ecc
2843 changed files with 37082 additions and 38426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/run/src/G4RunManager.cc
+17 -10
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4RunManager.cc,v 1.18 2000/12/14 10:38:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4RunManager.cc,v 1.23 2001/04/05 09:18:13 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
//
@@ -63,14 +63,14 @@ G4RunManager::G4RunManager()
eventManager = new G4EventManager();
timer = new G4Timer();
runMessenger = new G4RunMessenger(this);
previousEvents = new G4RWTPtrOrderedVector<G4Event>;
previousEvents = new G4std::vector<G4Event*>;
G4ParticleTable::GetParticleTable()->CreateMessenger();
G4ProcessTable::GetProcessTable()->CreateMessenger();
randomNumberStatusDir = "./";
G4cout
<< "**********************************************" << G4endl
<< " Geant4 version $Name: geant4-03-00 $" << G4endl
<< " (15-Dec-2000)" << G4endl
<< " Geant4 version $Name: geant4-03-01 $" << G4endl
<< " (06-Apr-2001)" << G4endl
<< " Copyright : Geant4 Collaboration" << G4endl
<< "**********************************************" << G4endl;
}
@@ -196,9 +196,12 @@ void G4RunManager::RunInitialization()
G4StateManager* stateManager = G4StateManager::GetStateManager();
stateManager->SetNewState(GeomClosed);
previousEvents->clearAndDestroy();
//previousEvents->clearAndDestroy();
for(G4int itr=0;itr<previousEvents->size();itr++)
{ delete (*previousEvents)[itr]; }
previousEvents->clear();
for(G4int i_prev=0;i_prev<n_perviousEventsToBeStored;i_prev++)
{ previousEvents->insert((G4Event*)NULL); }
{ previousEvents->push_back((G4Event*)NULL); }
runAborted = false;
@@ -282,7 +285,10 @@ void G4RunManager::RunTermination()
{
G4StateManager* stateManager = G4StateManager::GetStateManager();
previousEvents->clearAndDestroy();
//previousEvents->clearAndDestroy();
for(G4int itr=0;itr<previousEvents->size();itr++)
{ delete (*previousEvents)[itr]; }
previousEvents->clear();
if(userRunAction) userRunAction->EndOfRunAction(currentRun);
@@ -302,8 +308,9 @@ void G4RunManager::StackPreviousEvent(G4Event* anEvent)
{ evt = anEvent; }
else
{
previousEvents->prepend(anEvent);
evt = previousEvents->removeLast();
previousEvents->insert(previousEvents->begin(),anEvent);
evt = previousEvents->back();
previousEvents->pop_back();
}
delete evt;
}