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

Import Geant4 4.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 16:18:25 +02:00
parent 36c080dca6
commit 921d3b1cda
3990 changed files with 185376 additions and 82884 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/event/src/G4EventManager.cc
+15 -14
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4EventManager.cc,v 1.6.2.1 2001/06/28 19:07:56 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4EventManager.cc,v 1.11 2001/08/28 05:35:00 asaim Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
//
@@ -40,8 +40,8 @@ G4EventManager* G4EventManager::GetEventManager()
{ return fpEventManager; }
G4EventManager::G4EventManager()
:verboseLevel(0),trajectoryContainer(NULL),
tracking(false),currentEvent(NULL)
:currentEvent(0),trajectoryContainer(0),
verboseLevel(0),tracking(false)
{
if(fpEventManager)
{
@@ -82,8 +82,8 @@ G4EventManager::~G4EventManager()
/*
const G4EventManager & G4EventManager::operator=(const G4EventManager &right)
{ }
int G4EventManager::operator==(const G4EventManager &right) const { }
int G4EventManager::operator!=(const G4EventManager &right) const { }
G4int G4EventManager::operator==(const G4EventManager &right) const { }
G4int G4EventManager::operator!=(const G4EventManager &right) const { }
*/
@@ -105,7 +105,7 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
trackIDCounter = trackContainer->PrepareNewEvent();
#ifdef G4_STORE_TRAJECTORY
trajectoryContainer = NULL;
trajectoryContainer = 0;
#endif
sdManager = G4SDManager::GetSDMpointerIfExist();
@@ -122,7 +122,7 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
}
#endif
StackTracks( transformer->GimmePrimaries( currentEvent ) );
StackTracks( transformer->GimmePrimaries( currentEvent, trackIDCounter ),true );
#ifdef G4VERBOSE
if ( verboseLevel > 0 )
@@ -134,7 +134,7 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
#endif
G4VTrajectory* previousTrajectory;
while( ( track = trackContainer->PopNextTrack(&previousTrajectory) ) != NULL )
while( ( track = trackContainer->PopNextTrack(&previousTrajectory) ) != 0 )
{
#ifdef G4VERBOSE
@@ -160,8 +160,9 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
}
#endif
G4VTrajectory * aTrajectory = 0;
#ifdef G4_STORE_TRAJECTORY
G4VTrajectory * aTrajectory = trackManager->GimmeTrajectory();
aTrajectory = trackManager->GimmeTrajectory();
if(previousTrajectory)
{
@@ -203,7 +204,7 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
//if( secondaries ) secondaries->clearAndDestroy();
if( secondaries )
{
for(G4int i=0;i<secondaries->size();i++)
for(size_t i=0;i<secondaries->size();i++)
{ delete (*secondaries)[i]; }
secondaries->clear();
}
@@ -228,11 +229,11 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
#endif
if(userEventAction) userEventAction->EndOfEventAction(currentEvent);
currentEvent = NULL;
currentEvent = 0;
}
void G4EventManager::StackTracks(G4TrackVector *trackVector)
void G4EventManager::StackTracks(G4TrackVector *trackVector,G4bool IDhasAlreadySet)
{
G4Track * newTrack;
@@ -245,7 +246,7 @@ void G4EventManager::StackTracks(G4TrackVector *trackVector)
{
newTrack = (*trackVector)[ i ];
trackIDCounter++;
newTrack->SetTrackID( trackIDCounter );
if(!IDhasAlreadySet) newTrack->SetTrackID( trackIDCounter );
trackContainer->PushOneTrack( newTrack );
#ifdef G4VERBOSE
if ( verboseLevel > 1 )