Merge pull request #34569 from bsunanda/Run3-hcx303

Run3-hcx303 Add a few cfi's to help processing with DDD or DD4Hep
cms-sw · Jul 25, 2021 · 0ce31f0 · 0ce31f0
2 parents 74ffde3 + 4a7b2b5
commit 0ce31f0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/Configuration/Geometry/python/GeometryDDDSimDB_cff.py b/Configuration/Geometry/python/GeometryDDDSimDB_cff.py
@@ -8,7 +8,7 @@
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometryDB_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff   import *
-from Geometry.HcalCommonData.hcalSimulationParameters_cfi   import *
+from Geometry.HcalCommonData.hcalSimulationParameters_cff   import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cfi        import *
 from Geometry.HcalCommonData.hcalSimulationConstants_cfi    import *
 from Geometry.HcalCommonData.caloSimulationParameters_cff   import *

diff --git a/Configuration/Geometry/python/GeometrySLHCSimDB_cff.py b/Configuration/Geometry/python/GeometrySLHCSimDB_cff.py
@@ -7,7 +7,7 @@
 from GeometryReaders.XMLIdealGeometryESSource.cmsGeometryDB_cff import *
 from Geometry.TrackerNumberingBuilder.trackerNumbering2026GeometryDB_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff   import *
-from Geometry.HcalCommonData.hcalSimulationParameters_cfi   import *
+from Geometry.HcalCommonData.hcalSimulationParameters_cff   import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cfi        import *
 from Geometry.HcalCommonData.hcalSimulationConstants_cfi    import *
 from Geometry.HcalCommonData.caloSimulationParameters_cff   import *

diff --git a/Geometry/HcalCommonData/python/hcalDDConstants_cff.py b/Geometry/HcalCommonData/python/hcalDDConstants_cff.py
@@ -2,7 +2,6 @@
 
 from Geometry.HcalCommonData.hcalParameters_cff             import *
 from Geometry.HcalCommonData.hcalSimulationParameters_cff   import *
-from Geometry.HcalCommonData.hcalDDDSimConstants_cfi        import *
 from Geometry.HcalCommonData.hcalSimulationConstants_cfi    import *
-from Geometry.HcalCommonData.hcalDDDRecConstants_cfi        import *
 from Geometry.HcalCommonData.caloSimulationParameters_cff   import *
+from Geometry.HcalCommonData.hcalDBConstants_cff            import *
diff --git a/Geometry/HcalCommonData/python/hcalDDDSimConstants_cff.py b/Geometry/HcalCommonData/python/hcalDDDSimConstants_cff.py
@@ -2,6 +2,6 @@
 
 from Geometry.HcalCommonData.hcalParameters_cff             import *
 from Geometry.HcalCommonData.hcalSimulationParameters_cff   import *
-from Geometry.HcalCommonData.hcalDDDSimConstants_cfi        import *
 from Geometry.HcalCommonData.hcalSimulationConstants_cfi    import *
 from Geometry.HcalCommonData.caloSimulationParameters_cff   import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cfi        import *
diff --git a/Geometry/HcalCommonData/python/hcalDDFromDBConstants_cff.py b/Geometry/HcalCommonData/python/hcalDDFromDBConstants_cff.py
@@ -0,0 +1,6 @@
+import FWCore.ParameterSet.Config as cms
+
+from Geometry.HcalCommonData.hcalSimulationParameters_cff   import *
+from Geometry.HcalCommonData.hcalSimulationConstants_cfi    import *
+from Geometry.HcalCommonData.caloSimulationParameters_cff   import *
+from Geometry.HcalCommonData.hcalDBConstants_cff            import *