refactor(Base): 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.

Author: ChristianTackeGSI

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 : GetRunSim().RangeAllSensitiveVolumes()) {
         cutName = aVol->GetName();
         Ssiz_t pos = cutName.Index(copysign, 1);
         if (pos > 1) {

fairroot/base/sim/FairMCApplication.cxx

@@ -880,7 +880,7 @@ void FairMCApplication::InitGeometry()
     fMCEventHeader->SetRunID(runId);
 
     // Fill sensitive volumes in fVolMap
-    for (auto fv : FairModule::fAllSensitiveVolumes) {
+    for (auto fv : fRun->RangeAllSensitiveVolumes()) {
         if (!fv) {
             continue;
         }

fairroot/base/sim/FairModule.cxx

@@ -52,8 +52,6 @@
 #include <memory>
 #include <tuple>   // for std::ignore
 
-thread_local std::vector<FairVolume*> FairModule::fAllSensitiveVolumes;
-
 void FairModule::ConstructGeometry()
 {
     LOG(warn)
@@ -216,9 +214,10 @@ void FairModule::SetGeometryFileName(TString fname, TString)
 
 void FairModule::RegisterSensitiveVolume(FairVolume& vol)
 {
+    assert(fRunSim);
     vol.setModId(fModId);
     vol.SetModule(this);
-    fAllSensitiveVolumes.push_back(&vol);
+    fRunSim->RegisterSensitiveVolume(vol);
     ++fNbOfSensitiveVol;
 }
 
@@ -277,6 +276,7 @@ void FairModule::ProcessNodes(TList* nodes)
 
 void FairModule::AddSensitiveVolume(TGeoVolume* vol)
 {
+    assert(vol);
     auto volName = vol->GetName();
     LOG(debug2) << "AddSensitiveVolume " << volName;
 

fairroot/base/sim/FairModule.h

@@ -23,9 +23,9 @@
 #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 <cassert>
 #include <fairlogger/Logger.h>
 #include <string>
 #include <type_traits>
@@ -144,10 +144,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};   //!
-    /**
-     * For internal use only: list of all sensitive volumes in a simulaion session
-     */
-    static thread_local std::vector<FairVolume*> fAllSensitiveVolumes;   //!
 
     TString fMotherVolumeName{""};   //!
     /**
@@ -195,6 +191,16 @@ class FairModule : public TNamed
      */
     FairRootManager& GetRootManager();
 
+    /**
+     * \brief Get RunSim of this Module
+     * \note Only valid after being added to a RunSim
+     */
+    FairRunSim& GetRunSim()
+    {
+        assert(fRunSim);
+        return *fRunSim;
+    }
+
     /**
      * \brief Get Geometry Loader
      * \note Only valid during ConstructGeometry

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
@@ -223,6 +225,15 @@ class FairRunSim : public FairRun
 
     void ls(Option_t* option = "") const override;
 
+    /**
+     * \brief Internal: Add Sensitive Volume
+     */
+    void RegisterSensitiveVolume(FairVolume& vol) { fAllSensitiveVolumes.push_back(&vol); }
+    /**
+     * \brief Internal: Iterate over all sensitive Volumes
+     */
+    auto const& RangeAllSensitiveVolumes() const { return fAllSensitiveVolumes; }
+
   private:
     FairRunSim(const FairRunSim& M);
     FairRunSim& operator=(const FairRunSim&) { return *this; }
@@ -239,6 +250,11 @@ class FairRunSim : public FairRun
 
     std::unique_ptr<FairGeoLoader> fGeoLoader;   //!
 
+    /**
+     * For internal use only: 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