Fix the issue of 2026D91 which can now work in the dd4hep version

cms-sw · Feb 21, 2023 · 21d049a · 21d049a
1 parent 67b6191
commit 21d049a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D91_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D91_cff.py
@@ -6,7 +6,7 @@
 from Configuration.Geometry.GeometryDD4hep_cff import *
 DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml")
 
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
 from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *

diff --git a/Configuration/Geometry/python/GeometryExtended2026D91_cff.py b/Configuration/Geometry/python/GeometryExtended2026D91_cff.py
@@ -4,7 +4,7 @@
 # If you notice a mistake, please update the generating script, not just this config
 
 from Geometry.CMSCommonData.cmsExtendedGeometry2026D91XML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
 from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *

diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
@@ -264,7 +264,7 @@
             'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         ],
         "sim" : [
-            'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *',
+            'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *',
             'from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *',
         ],
         "reco" : [

diff --git a/Geometry/HcalCommonData/python/GeometryExtended2016Reco_cff.py b/Geometry/HcalCommonData/python/GeometryExtended2016Reco_cff.py
@@ -17,7 +17,6 @@
 
 #Tracker
 from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
-from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 
 #Muon