Import Geant4 10.5.1 source tree

source/geometry/navigation/History

@@ -16,9 +16,17 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+April 1, 2019 - G.Cosmo (geomnav-V10-04-13)
+------------------------
+- Protected report for looping particles under verbosity flag.
+
+March 11, 2019 - G.Cosmo
+------------------------
+- Fixed typos in printouts in G4NavigationLogger.
+
 September 26, 2018 - D.Sorokin (geomnav-V10-04-12)
------------------------
-- Notify G4ChordFinder at the beginning of each ComputeStep call. 
+------------------------------
+- Notify G4ChordFinder at the beginning of each ComputeStep() call. 
 
 June 15, 2018 - G.Cosmo (geomnav-V10-04-11)
 -----------------------

source/geometry/navigation/src/G4NavigationLogger.cc

@@ -381,7 +381,7 @@ G4NavigationLogger::CheckDaughterEntryPoint(const G4VSolid* sampleSolid,
     {
       msg << "NearMiss> Intersection to Daughter volume is in extension past the"
           <<   " current exit point of the mother volume." << G4endl;
-      msg << "          This is not an error - just an unusual occurence,"
+      msg << "          This is not an error - just an unusual occurrence,"
           <<   " possible in the case of concave volume. " << G4endl;
     }
     msg << "---- Information about intersection with daughter, mother: "

source/geometry/navigation/src/G4PropagatorInField.cc

@@ -243,8 +243,10 @@ G4PropagatorInField::ComputeStep(
     G4double stepTrial;
 
     stepTrial= fFull_CurveLen_of_LastAttempt; 
-    if( (stepTrial <= 0.0) && (fLast_ProposedStepLength > 0.0) ) 
+    if( (stepTrial <= 0.0) && (fLast_ProposedStepLength > 0.0) )
+    {
       stepTrial= fLast_ProposedStepLength; 
+    }
 
     G4double decreaseFactor = 0.9; // Unused default
     if(   (fNoZeroStep < fSevereActionThreshold_NoZeroSteps)
@@ -302,7 +304,9 @@ G4PropagatorInField::ComputeStep(
        return 0;  // = stepTrial;
      }
      if( stepTrial < CurrentProposedStepLength )
+     {
        CurrentProposedStepLength = stepTrial;
+     }
   }
   fLast_ProposedStepLength = CurrentProposedStepLength;
 
@@ -406,9 +410,10 @@ G4PropagatorInField::ComputeStep(
     }
     if( !intersects )
     {
-      StepTaken += s_length_taken; 
-      // For smooth trajectory display (jacek 01/11/2002)
-      if (fpTrajectoryFilter) {
+      StepTaken += s_length_taken;
+
+      if (fpTrajectoryFilter) // For smooth trajectory display (jacek 1/11/2002)
+      {
         fpTrajectoryFilter->TakeIntermediatePoint(CurrentState.GetPosition());
       }
     }
@@ -453,7 +458,7 @@ G4PropagatorInField::ComputeStep(
   {
     fParticleIsLooping = true;
   }
-  if ( fParticleIsLooping ) // && (fVerboseLevel > 0) )
+  if ( ( fParticleIsLooping ) && (fVerboseLevel > 0) )
   {
     ReportLoopingParticle( do_loop_count, StepTaken,
                            CurrentProposedStepLength, methodName,
@@ -512,7 +517,8 @@ G4PropagatorInField::ComputeStep(
      {
         fNoZeroStep++;
      }
-     else{
+     else
+     {
         fNoZeroStep = 0;
      }
   }