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

Import Geant4 11.0.2 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2022-05-25 15:50:57 +02:00
parent de4f28d823
commit b3bf75a2a1
341 changed files with 93127 additions and 39343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/run/History
+7
View File
@@ -16,6 +16,13 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
May 17, 2022 Ben Morgan (run-V10-07-15)
- Apply patches from Seth Johnson:
- Check for correct state in default exception handler before trying to access
manager classes that may be nullptr in other states
- Don't create a default exception manager in run manager kernel if one exists
already.
February 24, 2022 Makoto Asai (run-V10-07-14)
- Adding verbosity control to some G4cout. Addressing to bug report #2397.
source/run/src/G4ExceptionHandler.cc
+12 -8
View File
@@ -138,14 +138,18 @@ G4bool G4ExceptionHandler::Notify(const char* originOfException,
// --------------------------------------------------------------------
void G4ExceptionHandler::DumpTrackInfo()
{
G4ApplicationState aps = G4StateManager::GetStateManager()->GetCurrentState();
G4SteppingManager* steppingMgr = G4RunManagerKernel::GetRunManagerKernel()
->GetTrackingManager()
->GetSteppingManager();
const G4Track* theTrack = steppingMgr->GetfTrack();
const G4Step* theStep = steppingMgr->GetfStep();
const G4Track *theTrack = nullptr;
const G4Step *theStep = nullptr;
if (G4StateManager::GetStateManager()->GetCurrentState() == G4State_EventProc)
{
G4SteppingManager *steppingMgr = G4RunManagerKernel::GetRunManagerKernel()
->GetTrackingManager()
->GetSteppingManager();
theTrack = steppingMgr->GetfTrack();
theStep = steppingMgr->GetfStep();
}
if(aps != G4State_EventProc || theTrack == nullptr)
if (theTrack == nullptr)
{
G4cerr << " **** Track information is not available at this moment"
<< G4endl;
@@ -174,7 +178,7 @@ void G4ExceptionHandler::DumpTrackInfo()
<< G4endl;
}
if(aps != G4State_EventProc || !theStep)
if (theStep == nullptr)
{
G4cerr << " **** Step information is not available at this moment"
<< G4endl;
source/run/src/G4RunManagerKernel.cc
+10 -2
View File
@@ -122,7 +122,11 @@ G4RunManagerKernel::G4RunManagerKernel()
G4AllocatorList* allocList = G4AllocatorList::GetAllocatorListIfExist();
if(allocList != nullptr)
numberOfStaticAllocators = allocList->Size();
defaultExceptionHandler = new G4ExceptionHandler();
if(G4StateManager::GetStateManager()->GetExceptionHandler() == nullptr)
{
defaultExceptionHandler = new G4ExceptionHandler();
}
if(fRunManagerKernel != nullptr)
{
G4Exception("G4RunManagerKernel::G4RunManagerKernel()", "Run0001",
@@ -222,7 +226,11 @@ G4RunManagerKernel::G4RunManagerKernel(RMKType rmkType)
}
#endif
defaultExceptionHandler = new G4ExceptionHandler();
if(G4StateManager::GetStateManager()->GetExceptionHandler() == nullptr)
{
defaultExceptionHandler = new G4ExceptionHandler();
}
if(fRunManagerKernel != nullptr)
{
G4Exception("G4RunManagerKernel::G4RunManagerKernel()", "Run0001",