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

Import Geant4 10.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-10 14:11:04 +02:00
parent c9b32a6c0a
commit d4af681f38
4886 changed files with 420149 additions and 1023309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/navigation/src/G4PathFinder.cc
+22 -9
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4PathFinder.cc 81060 2014-05-20 09:12:39Z gcosmo $
// $Id: G4PathFinder.cc 90009 2015-05-08 07:42:39Z gcosmo $
// GEANT4 tag $ Name: $
//
// class G4PathFinder Implementation
@@ -263,23 +263,22 @@ G4PathFinder::ComputeStep( const G4FieldTrack &InitialFieldTrack,
#ifdef G4DEBUG_PATHFINDER
else
{
if( proposedStepLength < fTrueMinStep ) // For 2nd+ geometry
const G4double checkTolerance = 1.0e-9;
if( proposedStepLength < fTrueMinStep * ( 1.0 + checkTolerance) ) // For 2nd+ geometry
{
std::ostringstream message;
message.precision( 12 );
message << "Problem in step size request." << G4endl
<< " Error can be caused by incorrect process ordering."
<< " Being requested to make a step which is shorter"
<< " than the minimum Step " << G4endl
<< " already computed for any Navigator/geometry during"
<< " this tracking-step: " << G4endl
<< " This can happen due to an error in process ordering."
<< " This could happen due to an error in process ordering."
<< G4endl
<< " Check that all physics processes are registered"
<< G4endl
<< " before all processes with a navigator/geometry."
<< G4endl
<< " If using pre-packaged physics list and/or"
<< G4endl
<< " functionality, please report this error."
<< G4endl << G4endl
<< " Additional information for problem: " << G4endl
@@ -292,8 +291,11 @@ G4PathFinder::ComputeStep( const G4FieldTrack &InitialFieldTrack,
<< " Navigator raw return value" << G4endl
<< " Requested step now = " << proposedStepLength
<< G4endl
<< " Difference min-req = "
<< " Difference min-req (absolute) = "
<< fTrueMinStep-proposedStepLength << G4endl
<< " Relative (to max of two) = "
<< (fTrueMinStep-proposedStepLength)
/ std::max(proposedStepLength, fTrueMinStep) << G4endl
<< " -- Step info> stepNo= " << stepNo
<< " last= " << fLastStepNo
<< " newTr= " << fNewTrack << G4endl;
@@ -365,6 +367,8 @@ G4PathFinder::PrepareNewTrack( const G4ThreeVector& position,
fNewTrack= true;
this->MovePoint(); // Signal further that the last status is wiped
fpFieldPropagator->PrepareNewTrack(); // Inform field propagator of new track
// Message the G4NavigatorPanel / Dispatcher to find active navigators
//
std::vector<G4Navigator*>::iterator pNavigatorIter;
@@ -749,7 +753,7 @@ G4double G4PathFinder::ComputeSafety( const G4ThreeVector& position )
for( G4int num=0; num<fNoActiveNavigators; ++pNavigatorIter,++num )
{
G4double safety = (*pNavigatorIter)->ComputeSafety( position,true );
G4double safety = (*pNavigatorIter)->ComputeSafety( position, DBL_MAX, true );
if( safety < minSafety ) { minSafety = safety; }
fNewSafetyComputed[num]= safety;
}
@@ -1153,6 +1157,15 @@ G4PathFinder::DoNextCurvedStep( const G4FieldTrack &initialState,
G4FieldTrack fieldTrack= initialState;
G4ThreeVector startPoint= initialState.GetPosition();
G4EquationOfMotion* equationOfMotion =
(fpFieldPropagator->GetChordFinder()->GetIntegrationDriver()->GetStepper())
->GetEquationOfMotion();
equationOfMotion->SetChargeMomentumMass( *(initialState.GetChargeState()),
initialState.GetMomentum().mag2(),
initialState.GetRestMass() );
#ifdef G4DEBUG_PATHFINDER
G4int prc= G4cout.precision(9);
if( fVerboseLevel > 2 )
@@ -1172,7 +1185,7 @@ G4PathFinder::DoNextCurvedStep( const G4FieldTrack &initialState,
G4double minSafety= kInfinity, safety;
for( numNav=0; numNav < fNoActiveNavigators; ++numNav )
{
safety= fpNavigator[numNav]->ComputeSafety( startPoint, false );
safety= fpNavigator[numNav]->ComputeSafety( startPoint, DBL_MAX, false );
fPreSafetyValues[numNav]= safety;
fCurrentPreStepSafety[numNav]= safety;
minSafety = std::min( safety, minSafety );