seeds random for multithreading

icecube · Jul 5, 2024 · 8db81e6 · 8db81e6
1 parent 1bb757c
commit 8db81e6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/common/framework/include/OMSimActionInitialization.hh b/common/framework/include/OMSimActionInitialization.hh
@@ -6,14 +6,11 @@
 class OMSimActionInitialization : public G4VUserActionInitialization
 {
 public:
-    OMSimActionInitialization(long pSeed);
+    OMSimActionInitialization();
     virtual ~OMSimActionInitialization();
 
     virtual void BuildForMaster() const;
     virtual void Build() const;
-
-private:
-    long mMasterSeed;
 };
 
 #endif
diff --git a/common/framework/src/OMSim.cc b/common/framework/src/OMSim.cc
@@ -19,7 +19,7 @@ extern std::shared_ptr<spdlog::logger> globalLogger;
 OMSim::OMSim() : 
 mStartingTime(std::chrono::high_resolution_clock::now()), 
 mGeneralOptions("General options"), 
-mRunManager(std::make_unique<G4MTRunManager>()),
+mRunManager(nullptr),
 mVisManager(std::make_unique<G4VisExecutive>()),
 mNavigator(std::make_unique<G4Navigator>())
 {
@@ -155,9 +155,9 @@ void OMSim::initialiseSimulation(OMSimDetectorConstruction* pDetectorConstructio
 
     //CLHEP::HepRandom::setTheEngine(new CLHEP::RanluxEngine(lArgs.get<long>("seed"), 3));
     //CLHEP::HepRandom::setTheEngine(new CLHEP::MixMaxRng(lArgs.get<long>("seed")));
-    //G4Random::setTheEngine(new CLHEP::RanluxEngine(lArgs.get<long>("seed"), 3));
+    G4Random::setTheEngine(new CLHEP::RanluxEngine(lArgs.get<long>("seed"), 3));
 
-
+    mRunManager = std::make_unique<G4MTRunManager>();
     mRunManager->SetUserInitialization(pDetectorConstruction);
 
     mPhysics = std::make_unique<OMSimPhysicsList>();
@@ -166,7 +166,7 @@ void OMSim::initialiseSimulation(OMSimDetectorConstruction* pDetectorConstructio
 
     mVisManager->Initialize();
 
-    OMSimActionInitialization* actionInitialization = new OMSimActionInitialization(lArgs.get<long>("seed"));
+    OMSimActionInitialization* actionInitialization = new OMSimActionInitialization();
     mRunManager->SetUserInitialization(actionInitialization);
 
     // Set number of threads
@@ -182,6 +182,7 @@ void OMSim::initialiseSimulation(OMSimDetectorConstruction* pDetectorConstructio
     mNavigator.get()->LocateGlobalPointAndSetup(G4ThreeVector(0., 0., 0.));
 
     mHistory = std::unique_ptr<G4TouchableHistory>(mNavigator->CreateTouchableHistory());
+
 }
 
 /**

diff --git a/common/framework/src/OMSimActionInitialization.cc b/common/framework/src/OMSimActionInitialization.cc
@@ -6,8 +6,8 @@
 #include "OMSimSteppingAction.hh"
 #include <G4RandomTools.hh>
 
-OMSimActionInitialization::OMSimActionInitialization(long pSeed)
-    : G4VUserActionInitialization(), mMasterSeed(pSeed)
+OMSimActionInitialization::OMSimActionInitialization()
+    : G4VUserActionInitialization()
 {
 }
 
@@ -27,10 +27,4 @@ void OMSimActionInitialization::Build() const
     SetUserAction(new OMSimEventAction);
     SetUserAction(new OMSimTrackingAction);
     SetUserAction(new OMSimSteppingAction);
-    const long lPrime = 2147483647; 
-    long lSeed = (mMasterSeed + (G4Threading::G4GetThreadId()+1) * lPrime);
-    lSeed = lSeed % std::numeric_limits<long>::max();
-    log_debug("Random engine of thread {} was assigned seed {}", G4Threading::G4GetThreadId(), lSeed);
-    G4Random::setTheSeed(lSeed);
-    G4Random::setTheEngine(new CLHEP::RanluxEngine);
 }