Merge pull request #45986 from civanch/init_static_and_threadlocal_si…

…ngletones [SIM] improved initialisation
cms-sw · Sep 13, 2024 · 6e31ebe · 6e31ebe
2 parents e5de2f7 + 9390806
commit 6e31ebe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/SimG4Core/Application/src/RunManagerMT.cc b/SimG4Core/Application/src/RunManagerMT.cc
@@ -43,6 +43,7 @@
 #include "G4ParticleTable.hh"
 #include "G4CascadeInterface.hh"
 #include "G4EmParameters.hh"
+#include "G4LossTableManager.hh"
 #include "G4HadronicParameters.hh"
 #include "G4NuclearLevelData.hh"
 #include <CLHEP/Units/SystemOfUnits.h>
@@ -51,6 +52,8 @@
 #include "G4PhysicalVolumeStore.hh"
 #include "G4Region.hh"
 #include "G4RegionStore.hh"
+#include "G4PhysListUtil.hh"
+#include "G4PhysicsListHelper.hh"
 
 #include <iostream>
 #include <sstream>
@@ -85,6 +88,8 @@ RunManagerMT::RunManagerMT(edm::ParameterSet const& p)
   m_UIsession = new CustomUIsession();
   G4UImanager::GetUIpointer()->SetCoutDestination(m_UIsession);
   G4UImanager::GetUIpointer()->SetMasterUIManager(true);
+  G4PhysListUtil::InitialiseParameters();
+  G4LossTableManager::Instance();
 }
 
 RunManagerMT::~RunManagerMT() { delete m_UIsession; }
@@ -150,6 +155,7 @@ void RunManagerMT::initG4(const DDCompactView* pDD,
   G4HadronicParameters::Instance()->SetVerboseLevel(verb);
   G4EmParameters::Instance()->SetVerbose(verb);
   G4EmParameters::Instance()->SetWorkerVerbose(std::max(verb - 1, 0));
+  G4PhysicsListHelper::GetPhysicsListHelper();
 
   // exotic particle physics
   double monopoleMass = m_pPhysics.getUntrackedParameter<double>("MonopoleMass", 0);

diff --git a/SimG4Core/Application/src/RunManagerMTWorker.cc b/SimG4Core/Application/src/RunManagerMTWorker.cc
@@ -55,6 +55,8 @@
 #include "G4WorkerRunManagerKernel.hh"
 #include "G4StateManager.hh"
 #include "G4TransportationManager.hh"
+#include "G4LossTableManager.hh"
+#include "G4PhysListUtil.hh"
 #include "G4Field.hh"
 #include "G4FieldManager.hh"
 #include "G4ScoringManager.hh"
@@ -187,6 +189,8 @@ RunManagerMTWorker::RunManagerMTWorker(const edm::ParameterSet& p, edm::Consumes
         << "', valid are MessageLogger, MessageLoggerThreadPrefix, FilePerThread";
   }
   G4UImanager::GetUIpointer()->SetCoutDestination(m_UIsession);
+  //G4PhysListUtil::InitialiseParameters();
+  //G4LossTableManager::Instance();
 
   // sensitive detectors
   std::vector<std::string> onlySDs = p.getParameter<std::vector<std::string>>("OnlySDs");