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

Import Geant4 9.4.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 16:25:56 +02:00
parent 74cad5e589
commit 89a9605df1
4440 changed files with 379508 additions and 189225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/navigation/src/G4SimpleLocator.cc
+10 -6
View File
@@ -23,8 +23,8 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4SimpleLocator.cc,v 1.5 2008/12/11 10:27:58 tnikitin Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4SimpleLocator.cc,v 1.6 2010/07/13 15:59:42 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// Class G4SimpleLocator implementation
//
@@ -105,6 +105,8 @@ G4bool G4SimpleLocator::EstimateIntersectionPoint(
G4int substep_no = 0;
G4int oldprc; // cout/cerr precision settings
// Limits for substep number
//
const G4int max_substeps = 100000000; // Test 120 (old value 100 )
@@ -357,7 +359,7 @@ G4bool G4SimpleLocator::EstimateIntersectionPoint(
G4cerr << "Recalculation of EndPoint was called with fEpsStep= "
<< GetEpsilonStepFor() << G4endl;
}
G4cerr.precision(20);
oldprc = G4cerr.precision(20);
G4cerr << " Point A (Curve start) is " << CurveStartPointVelocity
<< G4endl;
G4cerr << " Point B (Curve end) is " << CurveEndPointVelocity
@@ -372,6 +374,7 @@ G4bool G4SimpleLocator::EstimateIntersectionPoint(
<< G4endl;
G4cerr << " LocateIntersection parameters are : Substep no= "
<< substep_no << G4endl;
G4cerr.precision(oldprc);
G4Exception("G4SimpleLocator::EstimateIntersectionPoint()",
"FatalError", FatalException,
@@ -451,7 +454,7 @@ G4bool G4SimpleLocator::EstimateIntersectionPoint(
printStatus( CurrentA_PointVelocity, CurrentB_PointVelocity,
-1.0, NewSafety, substep_no);
G4cout << G4endl;
G4cout.precision( 10 );
oldprc = G4cout.precision(10);
G4double done_len = CurrentA_PointVelocity.GetCurveLength();
G4double full_len = CurveEndPointVelocity.GetCurveLength();
G4cout << "ERROR - G4SimpleLocator::EstimateIntersectionPoint()"
@@ -459,6 +462,7 @@ G4bool G4SimpleLocator::EstimateIntersectionPoint(
<< " Undertaken only length: " << done_len
<< " out of " << full_len << " required." << G4endl;
G4cout << " Remaining length = " << full_len - done_len << G4endl;
G4cout.precision(oldprc);
G4Exception("G4SimpleLocator::EstimateIntersectionPoint()",
"UnableToLocateIntersection", FatalException,
@@ -466,7 +470,7 @@ G4bool G4SimpleLocator::EstimateIntersectionPoint(
}
else if( substep_no >= warn_substeps )
{
G4int oldprc= G4cout.precision( 10 );
oldprc= G4cout.precision(10);
G4cout << "WARNING - G4SimpleLocator::EstimateIntersectionPoint()"
<< G4endl
<< " Undertaken length: "
@@ -474,10 +478,10 @@ G4bool G4SimpleLocator::EstimateIntersectionPoint(
G4cout << " - Needed: " << substep_no << " substeps." << G4endl
<< " Warning level = " << warn_substeps
<< " and maximum substeps = " << max_substeps << G4endl;
G4cout.precision(oldprc);
G4Exception("G4SimpleLocator::EstimateIntersectionPoint()",
"DifficultyToLocateIntersection", JustWarning,
"Many substeps while trying to locate intersection.");
G4cout.precision( oldprc );
}
return !there_is_no_intersection; // Success or failure
}