Merge pull request #28789 from civanch/Improved_Geant4_destruction

Fixed destruction at exit of Geant4 components
cms-sw · Jan 27, 2020 · 65737ec · 65737ec
2 parents fadc536 + ca6e528
commit 65737ec
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/SimG4Core/Application/interface/RunManager.h b/SimG4Core/Application/interface/RunManager.h
@@ -93,7 +93,7 @@ class RunManager {
   edm::EDGetTokenT<edm::LHCTransportLinkContainer> m_LHCtr;
 
   bool m_nonBeam;
-  std::unique_ptr<CustomUIsession> m_UIsession;
+  CustomUIsession* m_UIsession;
   std::unique_ptr<PhysicsList> m_physicsList;
   PrimaryTransformer* m_primaryTransformer;
 

diff --git a/SimG4Core/Application/interface/RunManagerMT.h b/SimG4Core/Application/interface/RunManagerMT.h
@@ -88,7 +88,7 @@ class RunManagerMT {
 
   G4MTRunManagerKernel* m_kernel;
 
-  std::unique_ptr<CustomUIsession> m_UIsession;
+  CustomUIsession* m_UIsession;
   std::unique_ptr<PhysicsList> m_physicsList;
   bool m_managerInitialized;
   bool m_runTerminated;

diff --git a/SimG4Core/Application/src/RunManager.cc b/SimG4Core/Application/src/RunManager.cc
@@ -143,7 +143,7 @@ RunManager::RunManager(edm::ParameterSet const& p, edm::ConsumesCollector&& iC)
       m_g4overlap(p.getUntrackedParameter<edm::ParameterSet>("G4CheckOverlap")),
       m_G4Commands(p.getParameter<std::vector<std::string> >("G4Commands")),
       m_p(p) {
-  m_UIsession.reset(new CustomUIsession());
+  m_UIsession = new CustomUIsession();
   m_kernel = new G4RunManagerKernel();
   G4StateManager::GetStateManager()->SetExceptionHandler(new ExceptionHandler());
 
@@ -369,7 +369,7 @@ void RunManager::initG4(const edm::EventSetup& es) {
 
   // Geometry checks
   if (m_check || !regionFile.empty()) {
-    CMSG4CheckOverlap check(m_g4overlap, regionFile, m_UIsession.get(), pworld);
+    CMSG4CheckOverlap check(m_g4overlap, regionFile, m_UIsession, pworld);
   }
 
   // If the Geant4 particle table is needed, decomment the lines below

diff --git a/SimG4Core/Application/src/RunManagerMT.cc b/SimG4Core/Application/src/RunManagerMT.cc
@@ -71,7 +71,7 @@ RunManagerMT::RunManagerMT(edm::ParameterSet const& p)
       m_G4Commands(p.getParameter<std::vector<std::string> >("G4Commands")),
       m_p(p) {
   m_currentRun = nullptr;
-  m_UIsession.reset(new CustomUIsession());
+  m_UIsession = new CustomUIsession();
   m_physicsList.reset(nullptr);
   m_world.reset(nullptr);
 
@@ -227,7 +227,7 @@ void RunManagerMT::initG4(const DDCompactView* pDD,
 
   // Geometry checks
   if (m_check || !regionFile.empty()) {
-    CMSG4CheckOverlap check(m_g4overlap, regionFile, m_UIsession.get(), world);
+    CMSG4CheckOverlap check(m_g4overlap, regionFile, m_UIsession, world);
   }
 
   // If the Geant4 particle table is needed, decomment the lines below

diff --git a/SimG4Core/Application/src/RunManagerMTWorker.cc b/SimG4Core/Application/src/RunManagerMTWorker.cc
@@ -113,7 +113,6 @@ namespace {
 
 struct RunManagerMTWorker::TLSData {
   std::unique_ptr<G4RunManagerKernel> kernel;  //must be deleted last
-  std::unique_ptr<CustomUIsession> UIsession;
   std::unique_ptr<RunAction> userRunAction;
   std::unique_ptr<SimRunInterface> runInterface;
   std::unique_ptr<SimActivityRegistry> registry;
@@ -252,13 +251,11 @@ void RunManagerMTWorker::initializeThread(RunManagerMT& runManagerMaster, const
   G4UImanager::GetUIpointer()->SetUpForAThread(thisID);
   const std::string& uitype = m_pCustomUIsession.getUntrackedParameter<std::string>("Type", "MessageLogger");
   if (uitype == "MessageLogger") {
-    m_tls->UIsession.reset(new CustomUIsession());
+    new CustomUIsession();
   } else if (uitype == "MessageLoggerThreadPrefix") {
-    m_tls->UIsession.reset(new CustomUIsessionThreadPrefix(
-        m_pCustomUIsession.getUntrackedParameter<std::string>("ThreadPrefix", ""), thisID));
+    new CustomUIsessionThreadPrefix(m_pCustomUIsession.getUntrackedParameter<std::string>("ThreadPrefix", ""), thisID);
   } else if (uitype == "FilePerThread") {
-    m_tls->UIsession.reset(
-        new CustomUIsessionToFile(m_pCustomUIsession.getUntrackedParameter<std::string>("ThreadFile", ""), thisID));
+    new CustomUIsessionToFile(m_pCustomUIsession.getUntrackedParameter<std::string>("ThreadFile", ""), thisID);
   } else {
     throw edm::Exception(edm::errors::Configuration)
         << "Invalid value of CustomUIsession.Type '" << uitype