Import Geant4 11.2.0.beta source tree

source/geometry/navigation/include/G4PropagatorInField.icc

@@ -204,25 +204,6 @@ void G4PropagatorInField::SetMaximumEpsilonStep( G4double newEpsMax )
   fDetectorFieldMgr->SetMaximumEpsilonStep( newEpsMax );
 }
 
-// ------------------------------------------------------------------------
-//
-inline
-void G4PropagatorInField::SetLargestAcceptableStep( G4double newBigDist )
-{
-  if( fLargestAcceptableStep>0.0 )
-  {
-    fLargestAcceptableStep = newBigDist;
-  }
-}
-
-// ------------------------------------------------------------------------
-//
-inline
-G4double  G4PropagatorInField::GetLargestAcceptableStep()
-{
-  return fLargestAcceptableStep;
-}
-
 // ------------------------------------------------------------------------
 //
 inline
@@ -238,18 +219,28 @@ void G4PropagatorInField::SetThresholdNoZeroStep( G4int noAct,
                                                   G4int noHarsh,
                                                   G4int noAbandon )
 {
-  if( noAct>0 ) 
+  if( noAct>0 )
+  { 
     fActionThreshold_NoZeroSteps = noAct; 
+  }
 
   if( noHarsh > fActionThreshold_NoZeroSteps )
+  {
     fSevereActionThreshold_NoZeroSteps = noHarsh; 
+  }
   else
+  {
     fSevereActionThreshold_NoZeroSteps = 2*(fActionThreshold_NoZeroSteps+1);
+}
 
   if( noAbandon > fSevereActionThreshold_NoZeroSteps+5 )
+  {
     fAbandonThreshold_NoZeroSteps = noAbandon; 
+  }
   else
+  {
     fAbandonThreshold_NoZeroSteps = 2*(fSevereActionThreshold_NoZeroSteps+3); 
+  }
 }
 
 // ------------------------------------------------------------------------
@@ -313,7 +304,7 @@ SetNavigatorForPropagating( G4Navigator* SimpleOrMultiNavigator )
   if (SimpleOrMultiNavigator != nullptr)
   { 
     fNavigator = SimpleOrMultiNavigator; 
-    if( fIntersectionLocator )
+    if( fIntersectionLocator != nullptr )
     {
       fIntersectionLocator->SetNavigatorFor( SimpleOrMultiNavigator );
     }
@@ -442,7 +433,7 @@ void G4PropagatorInField::SetIterationsToIncreaseChordDistance(G4int numIters)
    if(numIters <= 0)
    {
      // Disables relaxation
-     if( fVerboseLevel ){
+     if( fVerboseLevel != 0 ){
        G4cout << "G4PropagatorInField: Turned OFF the Relaxation of chord "
               << "finder as iteration threshold = " << numIters
               << " is not positive." << G4endl;