chore: Refactor part of FairDetector::Initialize

A part of FairDetector::Initialize updates the sensitive volumes related to that Detector(Module). Instead of handling this inline, move the code to a new member function on FairRunSim.
FairRootGroup · Jun 10, 2024 · 050b6a4 · 050b6a4
1 parent 1d4a1e4
commit 050b6a4
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 20 deletions.
diff --git a/fairroot/base/sim/FairDetector.cxx b/fairroot/base/sim/FairDetector.cxx
@@ -94,25 +94,7 @@ void FairDetector::Initialize()
         DefineSensitiveVolumes();
     }
 
-    Int_t fMCid;
-    FairGeoNode* fN;
-    TString cutName;
-    TString copysign = "#";
-    for (auto aVol : FairRunSim::Instance()->fAllSensitiveVolumes) {
-        cutName = aVol->GetName();
-        Ssiz_t pos = cutName.Index(copysign, 1);
-        if (pos > 1) {
-            cutName.Resize(pos);
-        }
-        if (aVol->getModId() == GetModId()) {
-            fMCid = TVirtualMC::GetMC()->VolId(cutName.Data());
-            aVol->setMCid(fMCid);
-            fN = aVol->getGeoNode();
-            if (fN) {
-                fN->setMCid(fMCid);
-            }
-        }
-    }
+    FairRunSim::Instance()->UpdateSensitiveVolumesForModule(*this);
 
     // Initialize cached pointer to MC (on master in sequential mode)
     fMC = TVirtualMC::GetMC();

diff --git a/fairroot/base/steer/FairRunSim.cxx b/fairroot/base/steer/FairRunSim.cxx
@@ -28,6 +28,7 @@
 #include "FairRunIdGenerator.h"     // for FairRunIdGenerator
 #include "FairRuntimeDb.h"          // for FairRuntimeDb
 #include "FairTask.h"               // for FairTask
+#include "FairVolume.h"
 
 #include <TCollection.h>   // for TIter
 #include <TGeoManager.h>   // for gGeoManager
@@ -422,3 +423,24 @@ void FairRunSim::ls(Option_t* option) const
 }
 
 TMCThreadLocal FairRunSim* FairRunSim::fginstance = nullptr;
+
+void FairRunSim::UpdateSensitiveVolumesForModule(FairModule& mod)
+{
+    TString copysign = "#";
+    for (auto aVol : fAllSensitiveVolumes) {
+        if (aVol->getModId() != mod.GetModId()) {
+            continue;
+        }
+        TString cutName{aVol->GetName()};
+        Ssiz_t pos = cutName.Index(copysign, 1);
+        if (pos > 1) {
+            cutName.Resize(pos);
+        }
+        Int_t mcid = TVirtualMC::GetMC()->VolId(cutName.Data());
+        aVol->setMCid(mcid);
+        FairGeoNode* node = aVol->getGeoNode();
+        if (node) {
+            node->setMCid(mcid);
+        }
+    }
+}
diff --git a/fairroot/base/steer/FairRunSim.h b/fairroot/base/steer/FairRunSim.h
@@ -41,7 +41,6 @@ class FairVolume;
 class FairRunSim : public FairRun
 {
     friend class FairModule;
-    friend class FairDetector;
     friend class FairMCApplication;
 
   public:
@@ -222,6 +221,11 @@ class FairRunSim : public FairRun
 
     void ls(Option_t* option = "") const override;
 
+    /**
+     * \brief Internal helper for FairDetector
+     */
+    void UpdateSensitiveVolumesForModule(FairModule& mod);
+
   private:
     FairRunSim(const FairRunSim& M);
     FairRunSim& operator=(const FairRunSim&) { return *this; }