Import Geant4 8.3.0 source tree

This commit is contained in:
Gabriele Cosmo
2016-06-09 15:07:44 +02:00
parent fe73f43734
commit 75c7fd177d
764 changed files with 45230 additions and 95238 deletions
@@ -1224,7 +1224,7 @@ G4bool G4BinaryCascade::Capture(G4bool verbose)
<< particlesAboveCut << " " << particlesBelowCut << " " << capturedEnergy
<< " " << capturedEnergy/particlesBelowCut << " " << 0.2*theCutOnP << G4endl;
// if(particlesAboveCut==0 && particlesBelowCut>0 && capturedEnergy/particlesBelowCut<0.2*theCutOnP)
if(capturedEnergy/particlesBelowCut<0.2*theCutOnP)
if(particlesBelowCut>0 && capturedEnergy/particlesBelowCut<0.2*theCutOnP)
{
capture=true;
for(i = theSecondaryList.begin(); i != theSecondaryList.end(); ++i)
@@ -380,7 +380,8 @@ void G4RKPropagation::Transport(G4KineticTrackVector & active,
G4ThreeVector posold=kt->GetPosition();
// if (currentField->GetField(kt->GetPosition()) > kt->GetProjectilePotential() ||
if (! FieldTransport(kt, currTimeStep)) {
if ( currTimeStep > 0 &&
! FieldTransport(kt, currTimeStep)) {
FreeTransport(kt,currTimeStep);
}