Import Geant4 10.6.0.beta source tree

2019-06-28 11:59:04 +02:00
parent 28a70706e0
commit d0f911957d
1056 changed files with 95168 additions and 78160 deletions
@@ -112,7 +112,7 @@ AccurateAdvance( G4FieldTrack& track, G4double hstep,


    G4double h = hstep;
-    if (hinitial > perMillion * hstep && hinitial < hstep)
+    if (hinitial > CLHEP::perMillion * hstep && hinitial < hstep)
    {
        h = hinitial;
    }
@@ -277,7 +277,7 @@ void G4FSALIntegrationDriver<T>::CheckStep(
    const G4ThreeVector& posIn, const G4ThreeVector& posOut, G4double hdid)
 {
    const G4double endPointDist = (posOut - posIn).mag();
-    if (endPointDist >= hdid * (1. + perMillion))
+    if (endPointDist >= hdid * (1. + CLHEP::perMillion))
    {
        ++fNoAccurateAdvanceBadSteps;
 #ifdef G4DEBUG_FIELD