* fix a bug in DefinePhysicalInteractionLength that sometimes would

  trigger premature in-flight decays when a particle crosses a
  boundary in the geometry. [rtj]

Author: rjones30

src/G4.10.01.p02fixes/G4SteppingManager2.cc

@@ -260,7 +260,11 @@ void G4SteppingManager::GetProcessNumber()
        }
 
     	  // Transportation is assumed to be the last process in the vector
-       if(kp == MAXofAlongStepLoops-1)
+       // This is a bad assumption, should actually check! -rtj-
+       //if(kp == MAXofAlongStepLoops-1)
+	//  fStepStatus = fGeomBoundary;
+       G4ProcessType ptype = fCurrentProcess->GetProcessType();
+       if (ptype == fTransportation || ptype == fParallel)
 	  fStepStatus = fGeomBoundary;
      }
 
@@ -341,6 +345,7 @@ void G4SteppingManager::InvokeAtRestDoItProcs()
          = fCurrentProcess->AtRestDoIt( *fTrack, *fStep);
 
        // Set the current process as a process which defined this Step length
+       // Do not select a ParallelWorld process as the defining AtRestProc
        if (fCurrentProcess->GetProcessType() != fParallel)
           fStep->GetPostStepPoint()
               ->SetProcessDefinedStep(fCurrentProcess);

src/G4.10.02.p02fixes/G4SteppingManager2.cc

@@ -260,7 +260,11 @@ void G4SteppingManager::GetProcessNumber()
        }
 
     	  // Transportation is assumed to be the last process in the vector
-       if(kp == MAXofAlongStepLoops-1)
+       // This is a bad assumption, should actually check! -rtj-
+       //if(kp == MAXofAlongStepLoops-1)
+	//  fStepStatus = fGeomBoundary;
+       G4ProcessType ptype = fCurrentProcess->GetProcessType();
+       if (ptype == fTransportation || ptype == fParallel)
 	  fStepStatus = fGeomBoundary;
      }
 
@@ -341,6 +345,7 @@ void G4SteppingManager::InvokeAtRestDoItProcs()
          = fCurrentProcess->AtRestDoIt( *fTrack, *fStep);
 
        // Set the current process as a process which defined this Step length
+       // Do not select a ParallelWorld process as the defining AtRestProc
        if (fCurrentProcess->GetProcessType() != fParallel)
           fStep->GetPostStepPoint()
               ->SetProcessDefinedStep(fCurrentProcess);

src/G4.10.03.p01fixes/G4SteppingManager2.cc

@@ -260,7 +260,11 @@ void G4SteppingManager::GetProcessNumber()
        }
 
     	  // Transportation is assumed to be the last process in the vector
-       if(kp == MAXofAlongStepLoops-1)
+       // This is a bad assumption, should actually check! -rtj-
+       //if(kp == MAXofAlongStepLoops-1)
+	//  fStepStatus = fGeomBoundary;
+       G4ProcessType ptype = fCurrentProcess->GetProcessType();
+       if (ptype == fTransportation || ptype == fParallel)
 	  fStepStatus = fGeomBoundary;
      }
 
@@ -341,6 +345,7 @@ void G4SteppingManager::InvokeAtRestDoItProcs()
          = fCurrentProcess->AtRestDoIt( *fTrack, *fStep);
 
        // Set the current process as a process which defined this Step length
+       // Do not select a ParallelWorld process as the defining AtRestProc
        if (fCurrentProcess->GetProcessType() != fParallel)
           fStep->GetPostStepPoint()
               ->SetProcessDefinedStep(fCurrentProcess);

src/G4.10.04.p02fixes/G4SteppingManager2.cc

@@ -260,8 +260,12 @@ void G4SteppingManager::GetProcessNumber()
        }
 
     	  // Transportation is assumed to be the last process in the vector
-       if(kp == MAXofAlongStepLoops-1)
-	  fStepStatus = fGeomBoundary;
+       // This is a bad assumption, should actually check! -rtj-
+       //if(kp == MAXofAlongStepLoops-1)
+	//  fStepStatus = fGeomBoundary;
+       G4ProcessType ptype = fCurrentProcess->GetProcessType();
+       if (ptype == fTransportation || ptype == fParallel)
+	 fStepStatus = fGeomBoundary;
      }
 
      // Make sure to check the safety, even if Step is not limited 
@@ -341,6 +345,7 @@ void G4SteppingManager::InvokeAtRestDoItProcs()
          = fCurrentProcess->AtRestDoIt( *fTrack, *fStep);
 
        // Set the current process as a process which defined this Step length
+       // Do not select a ParallelWorld process as the defining AtRestProc
        if (fCurrentProcess->GetProcessType() != fParallel)
           fStep->GetPostStepPoint()
               ->SetProcessDefinedStep(fCurrentProcess);

src/G4.10.06.p01fixes/G4SteppingManager2.cc

@@ -259,8 +259,12 @@ void G4SteppingManager::GetProcessNumber()
        }
 
     	  // Transportation is assumed to be the last process in the vector
-       if(kp == MAXofAlongStepLoops-1)
-	  fStepStatus = fGeomBoundary;
+       // This is a bad assumption, should actually check! -rtj-
+       //if(kp == MAXofAlongStepLoops-1)
+	//  fStepStatus = fGeomBoundary;
+       G4ProcessType ptype = fCurrentProcess->GetProcessType();
+       if (ptype == fTransportation || ptype == fParallel)
+	 fStepStatus = fGeomBoundary;
      }
 
      // Make sure to check the safety, even if Step is not limited 
@@ -340,6 +344,7 @@ void G4SteppingManager::InvokeAtRestDoItProcs()
          = fCurrentProcess->AtRestDoIt( *fTrack, *fStep);
 
        // Set the current process as a process which defined this Step length
+       // Do not select a ParallelWorld process as the defining AtRestProc
        if (fCurrentProcess->GetProcessType() != fParallel)
           fStep->GetPostStepPoint()
               ->SetProcessDefinedStep(fCurrentProcess);