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

Import Geant4 4.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 16:39:52 +02:00
parent 921d3b1cda
commit 330b82b769
4524 changed files with 178689 additions and 43575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/global/management/src/G4StateManager.cc
+10 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4StateManager.cc,v 1.5 2001/07/18 17:59:23 asaim Exp $
// GEANT4 tag $Name: geant4-04-00 $
// $Id: G4StateManager.cc,v 1.6 2002/04/16 18:19:14 asaim Exp $
// GEANT4 tag $Name: geant4-04-01 $
//
//
// ------------------------------------------------------------
@@ -41,7 +41,8 @@ G4StateManager::G4StateManager()
: theCurrentState(PreInit),
thePreviousState(PreInit),
theBottomDependent(0),
suppressAbortion(0)
suppressAbortion(0),
msgptr(0)
{
}
@@ -159,11 +160,16 @@ G4StateManager::GetPreviousState() const
G4bool
G4StateManager::SetNewState(G4ApplicationState requestedState)
{ return SetNewState(requestedState,0); }
G4bool
G4StateManager::SetNewState(G4ApplicationState requestedState, const char* msg)
{
if(requestedState==Abort && suppressAbortion>0) {
if(suppressAbortion==2) return false;
if(theCurrentState==EventProc) return false;
}
msgptr = msg;
size_t i=0;
G4bool ack = true;
G4ApplicationState savedState = thePreviousState;
@@ -184,6 +190,7 @@ G4StateManager::SetNewState(G4ApplicationState requestedState)
theCurrentState = thePreviousState;
thePreviousState = savedState;
}
msgptr = 0;
return ack;
}