Merge branch 'naming.Quirks-20180201' into 'master'

Quirks: Comply with ATLAS naming conventions.

See merge request atlas/athena!8505

(cherry picked from commit e5f1c9ac [formerly 3ba04003])

267c6b0a Quirks: Comply with ATLAS naming conventions.

Former-commit-id: 1924f25852f963f7ea86fb2080f9a6ec66468075

Simulation/G4Extensions/Quirks/src/QuirkTransportation.h

@@ -146,68 +146,68 @@ class QuirkTransportation : public G4VProcess
 
   private:
 
-     G4Navigator*         fLinearNavigator;
-     G4PropagatorInField* fFieldPropagator;
+     G4Navigator*         m_linearNavigator;
+     G4PropagatorInField* m_fieldPropagator;
        // The Propagators used to transport the particle
 
      // G4FieldManager*      fGlobalFieldMgr;     // Used MagneticField CC
        // Field Manager for the whole Detector
 
-     G4ThreeVector        fTransportEndPosition;
-     G4ThreeVector        fTransportEndMomentumDir;
-     G4double             fTransportEndKineticEnergy;
-     G4ThreeVector        fTransportEndSpin;
-     G4bool               fMomentumChanged;
-     G4bool               fEnergyChanged;
-     G4double             fCandidateEndGlobalTime;
+     G4ThreeVector        m_transportEndPosition;
+     G4ThreeVector        m_transportEndMomentumDir;
+     G4double             m_transportEndKineticEnergy;
+     G4ThreeVector        m_transportEndSpin;
+     G4bool               m_momentumChanged;
+     G4bool               m_energyChanged;
+     G4double             m_candidateEndGlobalTime;
        // The particle's state after this Step, Store for DoIt
 
-     G4bool               fParticleIsLooping;
+     G4bool               m_particleIsLooping;
 
-     G4TouchableHandle    fCurrentTouchableHandle;
+     G4TouchableHandle    m_currentTouchableHandle;
      
      // G4bool         fFieldExists;
        // Whether a magnetic field exists ...
        // A data member for this is problematic: it is useful only if it
        // can be initialised and updated -- and a scheme is not yet possible.
 
-     G4bool fGeometryLimitedStep;
+     G4bool m_geometryLimitedStep;
        // Flag to determine whether a boundary was reached.
 
-     G4ThreeVector  fPreviousSftOrigin;
-     G4double       fPreviousSafety; 
+     G4ThreeVector  m_previousSftOrigin;
+     G4double       m_previousSafety; 
        // Remember last safety origin & value.
 
-     G4ParticleChangeForTransport fParticleChange;
+     G4ParticleChangeForTransport m_particleChange;
        // New ParticleChange
 
-     G4double endpointDistance;
+     G4double m_endpointDistance;
 
   // Thresholds for looping particles: 
   // 
-     G4double fThreshold_Warning_Energy;     //  Warn above this energy
-     G4double fThreshold_Important_Energy;   //  Hesitate above this
-     G4int    fThresholdTrials;              //    for this no of trials
+     G4double m_threshold_Warning_Energy;     //  Warn above this energy
+     G4double m_threshold_Important_Energy;   //  Hesitate above this
+     G4int    m_thresholdTrials;              //    for this no of trials
        // Above 'important' energy a 'looping' particle in field will 
        //   *NOT* be abandoned, except after fThresholdTrials attempts.
-     G4double fUnimportant_Energy;
+     G4double m_unimportant_Energy;
        //  Below this energy, no verbosity for looping particles is issued
 
   // Counter for steps in which particle reports 'looping',
   //   if it is above 'Important' Energy 
-     G4int    fNoLooperTrials; 
+     G4int    m_noLooperTrials; 
   // Statistics for tracks abandoned
-     G4double fSumEnergyKilled;
-     G4double fMaxEnergyKilled;
+     G4double m_sumEnergyKilled;
+     G4double m_maxEnergyKilled;
 
   // Whether to avoid calling G4Navigator for short step ( < safety)
   //   If using it, the safety estimate for endpoint will likely be smaller.
-     G4bool   fShortStepOptimisation; 
+     G4bool   m_shortStepOptimisation; 
 
-     G4SafetyHelper* fpSafetyHelper;  // To pass it the safety value obtained
+     G4SafetyHelper* m_safetyHelper;  // To pass it the safety value obtained
 
   // Verbosity 
-     G4int    fVerboseLevel;
+     G4int    m_verboseLevel;
        // Verbosity level for warnings
        // eg about energy non-conservation in magnetic field.
 };

Simulation/G4Extensions/Quirks/src/QuirkTransportation.icc

@@ -40,12 +40,12 @@
 inline void
 QuirkTransportation::SetPropagatorInField( G4PropagatorInField* pFieldPropagator)
 {
-   fFieldPropagator= pFieldPropagator;
+   m_fieldPropagator= pFieldPropagator;
 }
 
 inline G4PropagatorInField* QuirkTransportation::GetPropagatorInField()
 {
-   return fFieldPropagator;
+   return m_fieldPropagator;
 }
 
 inline G4bool QuirkTransportation::DoesGlobalFieldExist()
@@ -60,42 +60,42 @@ inline G4bool QuirkTransportation::DoesGlobalFieldExist()
 
 inline void QuirkTransportation::SetVerboseLevel( G4int verboseLev )
 {
-  fVerboseLevel= verboseLev;
+  m_verboseLevel= verboseLev;
 }
 
 inline G4int QuirkTransportation::GetVerboseLevel( ) const
 {
-  return fVerboseLevel;
+  return m_verboseLevel;
 }
 
 inline G4double QuirkTransportation::GetThresholdWarningEnergy() const
 {
-  return fThreshold_Warning_Energy;
+  return m_threshold_Warning_Energy;
 }
  
 inline G4double QuirkTransportation::GetThresholdImportantEnergy() const
 { 
-  return fThreshold_Important_Energy;
+  return m_threshold_Important_Energy;
 } 
 
 inline G4int QuirkTransportation::GetThresholdTrials() const
 {
-  return fThresholdTrials;
+  return m_thresholdTrials;
 }
 
 inline void QuirkTransportation::SetThresholdWarningEnergy( G4double newEnWarn )
 {
-  fThreshold_Warning_Energy= newEnWarn;
+  m_threshold_Warning_Energy= newEnWarn;
 }
 
 inline void QuirkTransportation::SetThresholdImportantEnergy( G4double newEnImp )
 {
-  fThreshold_Important_Energy = newEnImp; 
+  m_threshold_Important_Energy = newEnImp; 
 }
 
 inline void QuirkTransportation::SetThresholdTrials(G4int newMaxTrials )
 {
-  fThresholdTrials = newMaxTrials; 
+  m_thresholdTrials = newMaxTrials; 
 }
 
      // Get/Set parameters for killing loopers: 
@@ -105,28 +105,28 @@ inline void QuirkTransportation::SetThresholdTrials(G4int newMaxTrials )
 
 inline G4double QuirkTransportation::GetMaxEnergyKilled() const
 {
-  return fMaxEnergyKilled; 
+  return m_maxEnergyKilled; 
 }
 
 inline G4double QuirkTransportation::GetSumEnergyKilled() const
 {
-  return fSumEnergyKilled;
+  return m_sumEnergyKilled;
 }
 
 inline void QuirkTransportation::ResetKilledStatistics(G4int report)
 {
   if( report ) { 
     G4cout << " QuirkTransportation: Statistics for looping particles " << G4endl;
-    G4cout << "   Sum of energy of loopers killed: " <<  fSumEnergyKilled << G4endl;
-    G4cout << "   Max energy of loopers killed: " <<  fMaxEnergyKilled << G4endl;
+    G4cout << "   Sum of energy of loopers killed: " <<  m_sumEnergyKilled << G4endl;
+    G4cout << "   Max energy of loopers killed: " <<  m_maxEnergyKilled << G4endl;
   } 
 
-  fSumEnergyKilled= 0;
-  fMaxEnergyKilled= -1.0*CLHEP::GeV;
+  m_sumEnergyKilled= 0;
+  m_maxEnergyKilled= -1.0*CLHEP::GeV;
 }
      // Statistics for tracks killed (currently due to looping in field)
 
 inline void QuirkTransportation::EnableShortStepOptimisation(G4bool optimiseShortStep)
 { 
-  fShortStepOptimisation=optimiseShortStep;
+  m_shortStepOptimisation=optimiseShortStep;
 }

Simulation/G4Extensions/Quirks/src/QuirkWatcher.cxx

@@ -67,7 +67,7 @@ G4VParticleChange* QuirkWatcher::PostStepDoIt(
         string.TrackKilled();
     }
 
-    fParticleChange.Initialize(track);
-    fParticleChange.ProposeTrackStatus(stat);
-    return &fParticleChange;
+    m_particleChange.Initialize(track);
+    m_particleChange.ProposeTrackStatus(stat);
+    return &m_particleChange;
 }

Simulation/G4Extensions/Quirks/src/QuirkWatcher.h

@@ -44,7 +44,7 @@ public:
     ) {return 0;}
 
 private:
-    G4VParticleChange fParticleChange;
+    G4VParticleChange m_particleChange;
 };
 
 #endif