Import Geant4 9.2.0 source tree
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RichTrajectory.cc,v 1.6 2006/10/16 13:43:43 allison Exp $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RichTrajectoryPoint.cc,v 1.3 2006/09/27 20:42:52 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
//
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4SmoothTrajectory.cc,v 1.18 2006/10/16 13:37:17 allison Exp $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
//
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4SmoothTrajectoryPoint.cc,v 1.15 2006/06/29 21:16:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
//
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4SteppingManager.cc,v 1.48 2007/10/04 07:35:28 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
// $Id: G4SteppingManager.cc,v 1.49 2008/05/06 12:52:48 tsasaki Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
@@ -306,7 +306,7 @@ void G4SteppingManager::SetInitialStep(G4Track* valueTrack)
|
||||
fTrack->SetTouchableHandle( fTouchableHandle );
|
||||
fTrack->SetNextTouchableHandle( fTouchableHandle );
|
||||
}else{
|
||||
fTrack->SetNextTouchableHandle( fTrack->GetTouchableHandle() );
|
||||
fTrack->SetNextTouchableHandle( fTouchableHandle = fTrack->GetTouchableHandle() );
|
||||
G4VPhysicalVolume* oldTopVolume= fTrack->GetTouchableHandle()->GetVolume();
|
||||
G4VPhysicalVolume* newTopVolume=
|
||||
fNavigator->ResetHierarchyAndLocate( fTrack->GetPosition(),
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4SteppingManager2.cc,v 1.29 2006/06/29 21:16:05 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
// $Id: G4SteppingManager2.cc,v 1.35 2008/12/05 22:15:04 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
@@ -169,42 +169,54 @@ void G4SteppingManager::GetProcessNumber()
|
||||
#endif
|
||||
|
||||
switch (fCondition) {
|
||||
case ExclusivelyForced:
|
||||
(*fSelectedPostStepDoItVector)[np] = ExclusivelyForced;
|
||||
fStepStatus = fExclusivelyForcedProc;
|
||||
fStep->GetPostStepPoint()
|
||||
->SetProcessDefinedStep(fCurrentProcess);
|
||||
break;
|
||||
case Conditionally:
|
||||
(*fSelectedPostStepDoItVector)[np] = Conditionally;
|
||||
break;
|
||||
case Forced:
|
||||
(*fSelectedPostStepDoItVector)[np] = Forced;
|
||||
break;
|
||||
case StronglyForced:
|
||||
(*fSelectedPostStepDoItVector)[np] = StronglyForced;
|
||||
break;
|
||||
default:
|
||||
(*fSelectedPostStepDoItVector)[np] = InActivated;
|
||||
if(physIntLength < PhysicalStep ){
|
||||
PhysicalStep = physIntLength;
|
||||
fStepStatus = fPostStepDoItProc;
|
||||
fPostStepDoItProcTriggered = G4int(np);
|
||||
fStep->GetPostStepPoint()
|
||||
->SetProcessDefinedStep(fCurrentProcess);
|
||||
}
|
||||
case ExclusivelyForced:
|
||||
(*fSelectedPostStepDoItVector)[np] = ExclusivelyForced;
|
||||
fStepStatus = fExclusivelyForcedProc;
|
||||
fStep->GetPostStepPoint()
|
||||
->SetProcessDefinedStep(fCurrentProcess);
|
||||
break;
|
||||
case Conditionally:
|
||||
(*fSelectedPostStepDoItVector)[np] = Conditionally;
|
||||
break;
|
||||
case Forced:
|
||||
(*fSelectedPostStepDoItVector)[np] = Forced;
|
||||
break;
|
||||
case StronglyForced:
|
||||
(*fSelectedPostStepDoItVector)[np] = StronglyForced;
|
||||
break;
|
||||
default:
|
||||
(*fSelectedPostStepDoItVector)[np] = InActivated;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (fCondition==ExclusivelyForced) {
|
||||
for(size_t nrest=np+1; nrest < MAXofPostStepLoops; nrest++){
|
||||
(*fSelectedPostStepDoItVector)[nrest] = InActivated;
|
||||
}
|
||||
for(size_t nrest=np+1; nrest < MAXofPostStepLoops; nrest++){
|
||||
(*fSelectedPostStepDoItVector)[nrest] = InActivated;
|
||||
}
|
||||
return; // Take note the 'return' at here !!!
|
||||
}
|
||||
else{
|
||||
if(physIntLength < PhysicalStep ){
|
||||
PhysicalStep = physIntLength;
|
||||
fStepStatus = fPostStepDoItProc;
|
||||
fPostStepDoItProcTriggered = G4int(np);
|
||||
fStep->GetPostStepPoint()
|
||||
->SetProcessDefinedStep(fCurrentProcess);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if(fPostStepDoItProcTriggered<MAXofPostStepLoops)
|
||||
(*fSelectedPostStepDoItVector)[fPostStepDoItProcTriggered] = NotForced;
|
||||
|
||||
if (fPostStepDoItProcTriggered<MAXofPostStepLoops) {
|
||||
if ((*fSelectedPostStepDoItVector)[fPostStepDoItProcTriggered] ==
|
||||
InActivated) {
|
||||
(*fSelectedPostStepDoItVector)[fPostStepDoItProcTriggered] =
|
||||
NotForced;
|
||||
}
|
||||
}
|
||||
|
||||
// GPIL for AlongStep
|
||||
proposedSafety = DBL_MAX;
|
||||
@@ -334,7 +346,6 @@ void G4SteppingManager::InvokeAtRestDoItProcs()
|
||||
G4int num2ndaries;
|
||||
|
||||
num2ndaries = fParticleChange->GetNumberOfSecondaries();
|
||||
fN2ndariesAtRestDoIt += num2ndaries;
|
||||
|
||||
for(G4int DSecLoop=0 ; DSecLoop< num2ndaries; DSecLoop++){
|
||||
tempSecondaryTrack = fParticleChange->GetSecondary(DSecLoop);
|
||||
@@ -355,11 +366,13 @@ void G4SteppingManager::InvokeAtRestDoItProcs()
|
||||
if (pm->GetAtRestProcessVector()->entries()>0){
|
||||
tempSecondaryTrack->SetTrackStatus( fStopButAlive );
|
||||
fSecondary->push_back( tempSecondaryTrack );
|
||||
fN2ndariesAtRestDoIt++;
|
||||
} else {
|
||||
delete tempSecondaryTrack;
|
||||
}
|
||||
} else {
|
||||
fSecondary->push_back( tempSecondaryTrack );
|
||||
fN2ndariesAtRestDoIt++;
|
||||
}
|
||||
} //end of loop on secondary
|
||||
|
||||
@@ -408,7 +421,6 @@ void G4SteppingManager::InvokeAlongStepDoItProcs()
|
||||
G4int num2ndaries;
|
||||
|
||||
num2ndaries = fParticleChange->GetNumberOfSecondaries();
|
||||
fN2ndariesAlongStepDoIt += num2ndaries;
|
||||
|
||||
for(G4int DSecLoop=0 ; DSecLoop< num2ndaries; DSecLoop++){
|
||||
tempSecondaryTrack = fParticleChange->GetSecondary(DSecLoop);
|
||||
@@ -429,11 +441,13 @@ void G4SteppingManager::InvokeAlongStepDoItProcs()
|
||||
if (pm->GetAtRestProcessVector()->entries()>0){
|
||||
tempSecondaryTrack->SetTrackStatus( fStopButAlive );
|
||||
fSecondary->push_back( tempSecondaryTrack );
|
||||
fN2ndariesAlongStepDoIt++;
|
||||
} else {
|
||||
delete tempSecondaryTrack;
|
||||
}
|
||||
} else {
|
||||
fSecondary->push_back( tempSecondaryTrack );
|
||||
fN2ndariesAlongStepDoIt++;
|
||||
}
|
||||
} //end of loop on secondary
|
||||
|
||||
@@ -519,7 +533,6 @@ void G4SteppingManager::InvokePSDIP(size_t np)
|
||||
G4int num2ndaries;
|
||||
|
||||
num2ndaries = fParticleChange->GetNumberOfSecondaries();
|
||||
fN2ndariesPostStepDoIt += num2ndaries;
|
||||
|
||||
for(G4int DSecLoop=0 ; DSecLoop< num2ndaries; DSecLoop++){
|
||||
tempSecondaryTrack = fParticleChange->GetSecondary(DSecLoop);
|
||||
@@ -540,11 +553,13 @@ void G4SteppingManager::InvokePSDIP(size_t np)
|
||||
if (pm->GetAtRestProcessVector()->entries()>0){
|
||||
tempSecondaryTrack->SetTrackStatus( fStopButAlive );
|
||||
fSecondary->push_back( tempSecondaryTrack );
|
||||
fN2ndariesPostStepDoIt++;
|
||||
} else {
|
||||
delete tempSecondaryTrack;
|
||||
}
|
||||
} else {
|
||||
fSecondary->push_back( tempSecondaryTrack );
|
||||
fN2ndariesPostStepDoIt++;
|
||||
}
|
||||
} //end of loop on secondary
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4SteppingVerbose.cc,v 1.23 2006/07/14 14:13:57 tsasaki Exp $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4TrackingManager.cc,v 1.22 2006/11/14 10:58:47 tsasaki Exp $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4TrackingMessenger.cc,v 1.15 2006/11/03 11:13:38 allison Exp $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4Trajectory.cc,v 1.32 2006/10/16 13:39:35 allison Exp $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4TrajectoryPoint.cc,v 1.19 2006/06/29 21:16:15 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4UserSteppingAction.cc,v 1.10 2006/06/29 21:16:17 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4UserTrackingAction.cc,v 1.10 2006/06/29 21:16:19 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4VSteppingVerbose.cc,v 1.18 2006/11/14 10:58:47 tsasaki Exp $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4VTrajectory.cc,v 1.12 2006/10/16 13:45:01 allison Exp $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4VTrajectoryPoint.cc,v 1.4 2006/06/29 21:16:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user