Make reader thread-local to ensure thread-safety

legend-exp · Sep 3, 2024 · e5e983d · e5e983d
1 parent 7a1a7c9
commit e5e983d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/include/RMGGrabmayrGCReader.hh b/include/RMGGrabmayrGCReader.hh
@@ -38,7 +38,7 @@ struct GammaCascadeLine {
 class RMGGrabmayrGCReader {
   public:
 
-    static RMGGrabmayrGCReader* GetInstance();
+    static G4ThreadLocal RMGGrabmayrGCReader* GetInstance();
     ~RMGGrabmayrGCReader();
     // RMGGrabmayrGCReader& operator=(const RMGGrabmayrGCReader&) = delete;
 
@@ -49,7 +49,7 @@ class RMGGrabmayrGCReader {
 
   private:
 
-    static RMGGrabmayrGCReader* instance;
+    static G4ThreadLocal RMGGrabmayrGCReader* instance;
     RMGGrabmayrGCReader();
     // std::vector<std::unique_ptr<std::ifstream>> files;
     //  map holding the corresponding file for each isotope

diff --git a/src/RMGGrabmayrGCReader.cc b/src/RMGGrabmayrGCReader.cc
@@ -6,7 +6,7 @@
 #include "RMGLog.hh"
 
 
-RMGGrabmayrGCReader* RMGGrabmayrGCReader::instance = nullptr;
+G4ThreadLocal RMGGrabmayrGCReader* RMGGrabmayrGCReader::instance = nullptr;
 
 RMGGrabmayrGCReader* RMGGrabmayrGCReader::GetInstance() {
   if (instance == nullptr) { instance = new RMGGrabmayrGCReader(); }

diff --git a/src/RMGUserAction.cc b/src/RMGUserAction.cc
@@ -72,7 +72,6 @@ void RMGUserAction::Build() const {
   this->SetUserAction(new RMGStackingAction(run_action));
   this->SetUserAction(stepping_action);
   this->SetUserAction(tracking_action);
-  // Maybe add a check for multithreaded and only do this if not?
   RMGGrabmayrGCReader::GetInstance();
 }