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

Import Geant4 11.3.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2024-06-28 13:08:51 +02:00
parent f7b23877ed
commit e58e650b32
5232 changed files with 239416 additions and 244360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/event/src/G4EventManager.cc
+29 -20
View File
@@ -43,8 +43,6 @@
#include "G4TransportationManager.hh"
#include "G4Navigator.hh"
#include "Randomize.hh"
#include "G4Profiler.hh"
#include "G4TiMemory.hh"
#include "G4GlobalFastSimulationManager.hh"
#include "G4AutoLock.hh"
@@ -90,7 +88,8 @@ G4EventManager::~G4EventManager()
fpEventManager = nullptr;
}
void G4EventManager::DoProcessing(G4Event* anEvent)
void G4EventManager::DoProcessing(G4Event* anEvent,
G4TrackVector* trackVector, G4bool IDhasAlreadySet)
{
abortRequested = false;
G4ApplicationState currentState = stateManager->GetCurrentState();
@@ -101,7 +100,7 @@ void G4EventManager::DoProcessing(G4Event* anEvent)
return;
}
currentEvent = anEvent;
stateManager->SetNewState(G4State_EventProc);
if(!subEventParaWorker) stateManager->SetNewState(G4State_EventProc);
if(storetRandomNumberStatusToG4Event > 1)
{
std::ostringstream oss;
@@ -125,6 +124,7 @@ void G4EventManager::DoProcessing(G4Event* anEvent)
{
G4cout << "=====================================" << G4endl;
G4cout << " G4EventManager::ProcessOneEvent() " << G4endl;
if(trackVector!=nullptr) G4cout << " for a sub-event" << G4endl;
G4cout << "=====================================" << G4endl;
}
#endif
@@ -139,11 +139,7 @@ void G4EventManager::DoProcessing(G4Event* anEvent)
if(sdManager != nullptr)
{ currentEvent->SetHCofThisEvent(sdManager->PrepareNewEvent()); }
if(userEventAction != nullptr) userEventAction->BeginOfEventAction(currentEvent);
#if defined(GEANT4_USE_TIMEMORY)
eventProfiler.reset(new ProfilerConfig(currentEvent));
#endif
if(!subEventParaWorker && userEventAction != nullptr) userEventAction->BeginOfEventAction(currentEvent);
#ifdef G4VERBOSE
if ( verboseLevel > 1 )
@@ -153,6 +149,10 @@ void G4EventManager::DoProcessing(G4Event* anEvent)
}
#endif
if(trackVector!=nullptr)
{
StackTracks(trackVector,IDhasAlreadySet);
}
if(!abortRequested)
{
StackTracks(transformer->GimmePrimaries(currentEvent,trackIDCounter), true);
@@ -161,8 +161,8 @@ void G4EventManager::DoProcessing(G4Event* anEvent)
#ifdef G4VERBOSE
if ( verboseLevel > 0 )
{
G4cout << trackContainer->GetNTotalTrack() << " primaries "
<< "are passed from G4EventTransformer." << G4endl;
G4cout << trackContainer->GetNTotalTrack() << " primary tracks "
<< "are passed to the stack." << G4endl;
G4cout << "!!!!!!! Now start processing an event !!!!!!!" << G4endl;
}
#endif
@@ -309,10 +309,6 @@ void G4EventManager::DoProcessing(G4Event* anEvent)
sdManager->TerminateCurrentEvent(currentEvent->GetHCofThisEvent());
}
#if defined(GEANT4_USE_TIMEMORY)
eventProfiler.reset();
#endif
// In case of sub-event parallelism, an event may not be completed at
// this point but results of sus-events may be merged later. Thus
// userEventAction->EndOfEventAction() is invoked by G4RunManager
@@ -340,7 +336,7 @@ void G4EventManager::DoProcessing(G4Event* anEvent)
}
}
stateManager->SetNewState(G4State_GeomClosed);
if(!subEventParaWorker) stateManager->SetNewState(G4State_GeomClosed);
currentEvent = nullptr;
abortRequested = false;
}
@@ -357,7 +353,7 @@ void G4EventManager::TerminateSubEvent(const G4SubEvent* se,const G4Event* evt)
G4AutoLock lock(&EventMgrMutex);
auto ev = se->GetEvent();
ev->MergeSubEventResults(evt);
userEventAction->MergeSubEvent(ev,evt);
if(!subEventParaWorker && userEventAction!=nullptr) userEventAction->MergeSubEvent(ev,evt);
#ifdef G4VERBOSE
// Capture this here because termination will delete subevent...
G4int seType = se->GetSubEventType();
@@ -441,6 +437,12 @@ void G4EventManager::SetUserAction(G4UserSteppingAction* userAction)
trackManager->SetUserAction(userAction);
}
void G4EventManager::ProcessOneEventForSERM(G4Event* anEvent)
{
G4AutoLock lock(&EventMgrMutex);
ProcessOneEvent(anEvent);
}
void G4EventManager::ProcessOneEvent(G4Event* anEvent)
{
trackIDCounter = 0;
@@ -452,13 +454,21 @@ void G4EventManager::ProcessOneEvent(G4TrackVector* trackVector,
{
static G4ThreadLocal G4String* randStat = nullptr;
if (randStat == nullptr) randStat = new G4String;
trackIDCounter = 0;
G4bool tempEvent = false;
G4bool newEvent = false;
if(anEvent == nullptr)
{
anEvent = new G4Event();
tempEvent = true;
newEvent = true;
} else {
if(evID_inSubEv != anEvent->GetEventID()) {
evID_inSubEv = anEvent->GetEventID();
newEvent = true;
}
}
if(newEvent) trackIDCounter = 0;
if (storetRandomNumberStatusToG4Event==1
|| storetRandomNumberStatusToG4Event==3)
{
@@ -467,8 +477,7 @@ void G4EventManager::ProcessOneEvent(G4TrackVector* trackVector,
(*randStat) = oss.str();
anEvent->SetRandomNumberStatus(*randStat);
}
StackTracks(trackVector,false);
DoProcessing(anEvent);
DoProcessing(anEvent,trackVector,false);
if(tempEvent) { delete anEvent; }
}