Import Geant4 10.7.1 source tree

source/processes/transportation/History

@@ -16,8 +16,14 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
-Oct 26th 2020, G. Amadio & J.Apostolakis transport-V10-06-00
+Dec 16th 2020, G. Amadio transport-V10-06-01
+----------------------------
+Limit reporting of number of calls to G4Transportation::AlongStepDoIt()
+to when either G4VERBOSE or G4DEBUG_TRANSPORT is defined, which allows to
+avoid using a thread local variable for a slight performance gain.
 
+Oct 26th 2020, G. Amadio & J.Apostolakis transport-V10-06-00
+----------------------------
 A substantial reorganisation of G4Transportation::AlongStepGPIL
 to use values already in cache, reduce the number of branches, and
 use extra local variables for track properties to avoid indirections.

source/processes/transportation/src/G4Transportation.cc

@@ -492,9 +492,12 @@ G4double G4Transportation::AlongStepGetPhysicalInteractionLength(
 G4VParticleChange* G4Transportation::AlongStepDoIt( const G4Track& track,
                                                     const G4Step&  stepData )
 {
+#if defined(G4VERBOSE) || defined(G4DEBUG_TRANSPORT)
   static G4ThreadLocal G4long noCallsASDI=0;
-  const char *methodName= "AlongStepDoIt";
   noCallsASDI++;
+#else
+  #define noCallsASDI 0
+#endif
 
   fParticleChange.Initialize(track) ;
 
@@ -591,7 +594,7 @@ G4VParticleChange* G4Transportation::AlongStepDoIt( const G4Track& track,
         if( endEnergy > fThreshold_Warning_Energy && ! fSilenceLooperWarnings )
         {
           fpLogger->ReportLoopingTrack( track, stepData, fNoLooperTrials,
-                                        noCallsASDI, methodName );
+                                        noCallsASDI, __func__ );
         }
         fNoLooperTrials=0; 
       }
@@ -606,7 +609,7 @@ G4VParticleChange* G4Transportation::AlongStepDoIt( const G4Track& track,
 #ifdef G4VERBOSE
         if( verboseLevel > 2 && ! fSilenceLooperWarnings )
         {
-          G4cout << "   " << methodName  
+          G4cout << "   " << __func__
                  << " Particle is looping but is saved ..."  << G4endl             
                  << "   Number of trials = " << fNoLooperTrials << G4endl
                  << "   No of calls to  = " << noCallsASDI << G4endl;

source/processes/transportation/src/G4TransportationLogger.cc

@@ -129,10 +129,11 @@ void G4TransportationLogger::ReportLoopingTrack( const G4Track & track,
       << G4endl     
       << " Number of propagation trials = " << numTrials
       << " ( vs maximum = " << GetThresholdTrials() << " for 'important' particles ) " 
-      << G4endl
-      << "   ( Number of *calls* of Transport/AlongStepDoIt = " << noCalls << " )"
       << G4endl;
 
+  if (noCalls)
+    msg << "   ( Number of *calls* of Transport/AlongStepDoIt = " << noCalls << " )" << G4endl;
+
   const G4int numPrints= 5;
   if( numAdviceExcessSteps++ < numPrints )
   {