chore: Move FairModule::fAllSensitiveVolumes to FairRunSim

Instead of using a thread local, let's use something that is tied to the "simulaion session" (as noted in some places). FairRunSim has all the Modules anyway, so let it also have the list of sensitive Volumes.
FairRootGroup · Jun 10, 2024 · 1d4a1e4 · 1d4a1e4
1 parent 32bb52f
commit 1d4a1e4
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/fairroot/base/sim/FairDetector.cxx b/fairroot/base/sim/FairDetector.cxx
@@ -14,6 +14,7 @@
 
 #include "FairGeoNode.h"   // for FairGeoNode
 #include "FairRootManager.h"
+#include "FairRunSim.h"
 #include "FairVolume.h"   // for FairVolume
 
 #include <TFolder.h>       // for TFolder
@@ -97,7 +98,7 @@ void FairDetector::Initialize()
     FairGeoNode* fN;
     TString cutName;
     TString copysign = "#";
-    for (auto aVol : fAllSensitiveVolumes) {
+    for (auto aVol : FairRunSim::Instance()->fAllSensitiveVolumes) {
         cutName = aVol->GetName();
         Ssiz_t pos = cutName.Index(copysign, 1);
         if (pos > 1) {

diff --git a/fairroot/base/sim/FairMCApplication.cxx b/fairroot/base/sim/FairMCApplication.cxx
@@ -887,7 +887,7 @@ void FairMCApplication::InitGeometry()
     fMCEventHeader->SetRunID(runId);
 
     // Fill sensitive volumes in fVolMap
-    for (auto fv : FairModule::fAllSensitiveVolumes) {
+    for (auto fv : fRun->fAllSensitiveVolumes) {
         if (!fv) {
             continue;
         }

diff --git a/fairroot/base/sim/FairModule.cxx b/fairroot/base/sim/FairModule.cxx
@@ -20,7 +20,7 @@
 #include "FairGeoNode.h"        // for FairGeoNode
 #include "FairGeoParSet.h"      // for FairBaseParSet
 #include "FairMCApplication.h"
-#include "FairRun.h"          // for FairRun
+#include "FairRunSim.h"       // for FairRun, FairRunSim
 #include "FairRuntimeDb.h"    // for FairRuntimeDb
 #include "FairVolume.h"       // for FairVolume
 #include "FairVolumeList.h"   // for FairVolumeList
@@ -50,8 +50,6 @@
 #include <memory>
 #include <tuple>   // for std::ignore
 
-thread_local std::vector<FairVolume*> FairModule::fAllSensitiveVolumes;
-
 void FairModule::ConstructGeometry()
 {
     LOG(warn)
@@ -200,11 +198,11 @@ void FairModule::SetGeometryFileName(TString fname, TString)
     fgeoName = "";
 }
 
-void FairModule::RegisterSensitiveVolume(FairVolume& vol)
+void FairModule::RegisterSensitiveVolume(FairRunSim& run, FairVolume& vol)
 {
     vol.setModId(fModId);
     vol.SetModule(this);
-    fAllSensitiveVolumes.push_back(&vol);
+    run.fAllSensitiveVolumes.push_back(&vol);
     ++fNbOfSensitiveVol;
 }
 
@@ -221,7 +219,8 @@ void FairModule::ProcessNodes(TList* nodes)
         vList = new FairVolumeList();
     }
 
-    auto rtdb = FairRun::Instance()->GetRuntimeDb();
+    auto& run = *(FairRunSim::Instance());
+    auto rtdb = run.GetRuntimeDb();
     auto par = static_cast<FairGeoParSet*>(rtdb->getContainer("FairGeoParSet"));
     TSeqCollection* parNodes = par->GetGeoNodes();
     for (auto node : TRangeDynCast<FairGeoNode>(nodes)) {
@@ -251,7 +250,7 @@ void FairModule::ProcessNodes(TList* nodes)
         }
 
         if (node->isSensitive() && fActive) {
-            RegisterSensitiveVolume(*addedVol);
+            RegisterSensitiveVolume(run, *addedVol);
             parNodes->AddLast(node);
         }
     }
@@ -267,7 +266,7 @@ void FairModule::AddSensitiveVolume(TGeoVolume* vol)
         return;
     }
     ++fNbOfVolumes;
-    RegisterSensitiveVolume(*addedVol);
+    RegisterSensitiveVolume(*FairRunSim::Instance(), *addedVol);
 }
 
 FairVolume* FairModule::getFairVolume(FairGeoNode* fN)

diff --git a/fairroot/base/sim/FairModule.h b/fairroot/base/sim/FairModule.h
@@ -23,12 +23,11 @@
 #include <TList.h>       // for TList (ptr only), TListIter
 #include <TNamed.h>      // for TNamed
 #include <TObjArray.h>   // for TObjArray
-#include <TRefArray.h>   // for TRefArray
 #include <TString.h>     // for TString, operator!=
 #include <TVirtualMC.h>
 #include <string>
-#include <vector>
 
+class FairRunSim;
 class FairVolumeList;
 class FairVolume;
 
@@ -140,8 +139,6 @@ class FairModule : public TNamed
     static thread_local inline FairVolumeList* vList{nullptr};   //!
     /**total number of volumes in a simulaion session*/
     static thread_local inline Int_t fNbOfVolumes{0};   //!
-    /**list of all sensitive volumes in  a simulaion session*/
-    static thread_local std::vector<FairVolume*> fAllSensitiveVolumes;   //!
 
     TString fMotherVolumeName{""};   //!
     /**
@@ -159,7 +156,7 @@ class FairModule : public TNamed
     void ReAssignMediaId();
     void swap(FairModule& other) throw();
 
-    void RegisterSensitiveVolume(FairVolume&);
+    void RegisterSensitiveVolume(FairRunSim& run, FairVolume&);
 
   protected:
     FairModule(const FairModule&);

diff --git a/fairroot/base/steer/FairRunSim.h b/fairroot/base/steer/FairRunSim.h
@@ -21,13 +21,15 @@
 #include <functional>
 #include <memory>
 #include <utility>
+#include <vector>
 
 class FairField;
 class FairGeoLoader;
 class FairMCEventHeader;
 class FairMesh;
 class FairModule;
 class FairPrimaryGenerator;
+class FairVolume;
 
 /**
  * \brief Configure the Simulation session
@@ -38,6 +40,10 @@ class FairPrimaryGenerator;
  */
 class FairRunSim : public FairRun
 {
+    friend class FairModule;
+    friend class FairDetector;
+    friend class FairMCApplication;
+
   public:
     /** default ctor*/
     FairRunSim(Bool_t isMaster = kTRUE);
@@ -226,6 +232,9 @@ class FairRunSim : public FairRun
 
     std::unique_ptr<FairGeoLoader> fGeoLoader;   //!
 
+    /**list of all sensitive volumes in  a simulaion session*/
+    std::vector<FairVolume*> fAllSensitiveVolumes;   //!
+
   protected:
     Int_t count{0};                     //!< Internal counter
     FairMCApplication* fApp{nullptr};   //!< Main VMC application