Format fixes

FairRootGroup · Jul 8, 2022 · 96b1b31 · 96b1b31
1 parent 2ab950f
commit 96b1b31
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/base/sim/FairDetector.cxx b/base/sim/FairDetector.cxx
@@ -12,9 +12,9 @@
 
 #include "FairDetector.h"
 
-#include "FairGeoNode.h"         // for FairGeoNode
-#include "FairLogger.h"          // for FairLogger, MESSAGE_ORIGIN
-#include "FairModule.h"          // for FairModule::svList, etc
+#include "FairGeoNode.h"   // for FairGeoNode
+#include "FairLogger.h"    // for FairLogger, MESSAGE_ORIGIN
+#include "FairModule.h"    // for FairModule::svList, etc
 #include "FairRootManager.h"
 #include "FairVolume.h"   // for FairVolume
 
@@ -134,6 +134,7 @@ void FairDetector::ProcessHits()
         LOG(warning) << "        Replace with void FairDetector::ProcessHits(). ";
         return true;
     }();
+    (void)printOnce;
     ProcessHits(NULL);
     return;
 }

diff --git a/base/sim/FairMCApplication.cxx b/base/sim/FairMCApplication.cxx
@@ -548,9 +548,6 @@ void FairMCApplication::Stepping()
         TrackId = fMC->GetStack()->GetCurrentTrackNumber();
     }
 
-    Int_t copyNo;
-    Int_t id = fMC->CurrentVolID(copyNo);
-
     // If information about the tracks should be stored the information as to be
     // stored for any step.
     // Information about each single step has also to be stored for the other
@@ -567,15 +564,17 @@ void FairMCApplication::Stepping()
             fTrajFilter->GetCurrentTrk()->AddPoint(fTrkPos.X(), fTrkPos.Y(), fTrkPos.Z(), fTrkPos.T());
         }
     }
-    if (fRadLenMan) {
-        id = fMC->CurrentVolID(copyNo);
-        auto modvoliter = fgMasterInstance->fModVolMap.find(id);
-        fRadLenMan->AddPoint(fMC, modvoliter->second);
-    }
-    if (fRadMapMan) {
+    if (fRadLenMan || fRadMapMan) {
+        Int_t copyNo;
+        Int_t id = fMC->CurrentVolID(copyNo);
         id = fMC->CurrentVolID(copyNo);
         auto modvoliter = fgMasterInstance->fModVolMap.find(id);
-        fRadMapMan->AddPoint(fMC, modvoliter->second);
+        if (fRadLenMan) {
+            fRadLenMan->AddPoint(fMC, modvoliter->second);
+        }
+        if (fRadMapMan) {
+            fRadMapMan->AddPoint(fMC, modvoliter->second);
+        }
     }
     if (fRadGridMan) {
         fRadGridMan->FillMeshList();

diff --git a/base/sim/FairModule.h b/base/sim/FairModule.h
@@ -144,11 +144,11 @@ class FairModule : public TVirtualMCSensitiveDetector
     FairVolume* getFairVolume(FairGeoNode* fNode);
     void AddSensitiveVolume(TGeoVolume* v);
 
-    virtual void EndOfEvent() {}
+    void EndOfEvent() override {}
 
-    virtual void Initialize() {}
+    void Initialize() override {}
 
-    virtual void ProcessHits() {}
+    void ProcessHits() override {}
 
   private:
     /** Re-implimented from ROOT:  TGeoMatrix::SetDefaultName()  */