Merge pull request #27295 from ianna/sim-dd4hep-tracked-flag

Sim G4 Geometry from dd4hep Tracked Flag
cms-sw · Jun 21, 2019 · f7d3840 · f7d3840
2 parents 89c31e6 + b557da1
commit f7d3840
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/SimG4Core/Application/python/g4SimHits_cfi.py b/SimG4Core/Application/python/g4SimHits_cfi.py
@@ -41,7 +41,7 @@
 )
 
 g4SimHits = cms.EDProducer("OscarMTProducer",
-    g4GeometryDD4hepSource = cms.untracked.bool(False),
+    g4GeometryDD4hepSource = cms.bool(False),
     NonBeamEvent = cms.bool(False),
     G4EventManagerVerbosity = cms.untracked.int32(0),
     G4StackManagerVerbosity = cms.untracked.int32(0),

diff --git a/SimG4Core/Application/src/OscarMTMasterThread.cc b/SimG4Core/Application/src/OscarMTMasterThread.cc
@@ -22,7 +22,7 @@
 
 OscarMTMasterThread::OscarMTMasterThread(const edm::ParameterSet& iConfig)
     : m_pUseMagneticField(iConfig.getParameter<bool>("UseMagneticField")),
-      m_pGeoFromDD4hep(iConfig.getUntrackedParameter<bool>("g4GeometryDD4hepSource", false)),
+      m_pGeoFromDD4hep(iConfig.getParameter<bool>("g4GeometryDD4hepSource")),
       m_pDD(nullptr),
       m_pDD4hep(nullptr),
       m_pMF(nullptr),

diff --git a/SimG4Core/Application/src/RunManagerMT.cc b/SimG4Core/Application/src/RunManagerMT.cc
@@ -109,7 +109,7 @@ void RunManagerMT::initG4(const DDCompactView* pDD,
     return;
 
   edm::LogVerbatim("SimG4CoreApplication") << "RunManagerMT: start initialisation of geometry";
-  auto geoFromDD4hep = m_p.getUntrackedParameter<bool>("g4GeometryDD4hepSource", false);
+  auto geoFromDD4hep = m_p.getParameter<bool>("g4GeometryDD4hepSource");
   // DDDWorld: get the DDCV from the ES and use it to build the World
   G4LogicalVolumeToDDLogicalPartMap map_lv;
   dd4hep::sim::Geant4GeometryMaps::VolumeMap lvMap;

diff --git a/SimG4Core/Geometry/interface/DDDWorld.h b/SimG4Core/Geometry/interface/DDDWorld.h
@@ -9,7 +9,6 @@ class DDG4Builder;
 class DDCompactView;
 
 namespace cms {
-  class DDCompactView;
   class DDDetector;
 }  // namespace cms
 
@@ -18,7 +17,6 @@ class DDDWorld {
   DDDWorld(const DDCompactView *, G4LogicalVolumeToDDLogicalPartMap &, SensitiveDetectorCatalog &, bool check = false);
   DDDWorld(const cms::DDDetector *, dd4hep::sim::Geant4GeometryMaps::VolumeMap &);
   ~DDDWorld();
-  static void SetAsWorld(G4VPhysicalVolume *pv);
   static void WorkerSetAsWorld(G4VPhysicalVolume *pv);
   const G4VPhysicalVolume *GetWorldVolume() const { return m_world; }
 
@@ -29,6 +27,7 @@ class DDDWorld {
   G4VPhysicalVolume *GetWorldVolumeForWorker() const { return m_world; }
 
 private:
+  void SetAsWorld(G4VPhysicalVolume *pv);
   G4VPhysicalVolume *m_world;
 };