Import Geant4 9.3.0 source tree

source/tracking/src/G4SteppingManager2.cc

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4SteppingManager2.cc,v 1.35 2008/12/05 22:15:04 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4SteppingManager2.cc,v 1.37 2009/09/25 00:23:41 gum Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
 //
@@ -275,7 +275,6 @@ void G4SteppingManager::GetProcessNumber()
 void G4SteppingManager::InvokeAtRestDoItProcs()
 //////////////////////////////////////////////////////
 {
-
 // Select the rest process which has the shortest time before
 // it is invoked. In rest processes, GPIL()
 // returns the time before a process occurs.
@@ -293,18 +292,20 @@ void G4SteppingManager::InvokeAtRestDoItProcs()
        continue;
      }   // NULL means the process is inactivated by a user on fly.
 
-     lifeTime = 
+     lifeTime =
        fCurrentProcess->AtRestGPIL( 
                                                      *fTrack,
                                                 &fCondition );
-     if(fCondition==Forced){
+
+     if(fCondition==Forced && fCurrentProcess){
        (*fSelectedAtRestDoItVector)[ri] = Forced;
      }
      else{
        (*fSelectedAtRestDoItVector)[ri] = InActivated;
-      if(lifeTime < shortestLifeTime ){
-         shortestLifeTime = lifeTime;
-	 fAtRestDoItProcTriggered =  G4int(int(ri)); 
+       if(lifeTime < shortestLifeTime ){
+          shortestLifeTime = lifeTime;
+          fAtRestDoItProcTriggered =  G4int(int(ri));
+          (*fSelectedAtRestDoItVector)[fAtRestDoItProcTriggered] = NotForced;
        }
      }
    }
@@ -314,8 +315,6 @@ void G4SteppingManager::InvokeAtRestDoItProcs()
    if(NofInactiveProc==MAXofAtRestLoops){ 
      //     G4Exception("G4SteppingManager::InvokeAtRestDoItProcs: No AtRestDoIt process is active. " );
      G4cerr << "G4SteppingManager::InvokeAtRestDoItProcs: No AtRestDoIt process is active. " << G4endl;
-   } else {
-        (*fSelectedAtRestDoItVector)[fAtRestDoItProcTriggered] = NotForced;
    }
 
    fStep->SetStepLength( 0. );  //the particle has stopped
@@ -329,7 +328,6 @@ void G4SteppingManager::InvokeAtRestDoItProcs()
    //
      if( (*fSelectedAtRestDoItVector)[MAXofAtRestLoops-np-1] != InActivated){
 
-
        fCurrentProcess = (*fAtRestDoItVector)[np];
        fParticleChange 
          = fCurrentProcess->AtRestDoIt( *fTrack, *fStep);
@@ -382,7 +380,6 @@ void G4SteppingManager::InvokeAtRestDoItProcs()
 
      } //if(fSelectedAtRestDoItVector[np] != InActivated){
    } //for(size_t np=0; np < MAXofAtRestLoops; np++){
-
    fStep->UpdateTrack();
 
    fTrack->SetTrackStatus( fStopAndKill );
@@ -614,4 +611,3 @@ void G4SteppingManager::ApplyProductionCut(G4Track* aSecondary)
   }
 }
 
-