Merge pull request cms-sw#40838 from bsunanda/Phase2-gex154B

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

Author: cmsbuild

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 *

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 *

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" : [

Configuration/StandardSequences/python/GeometryConf.py

@@ -56,6 +56,7 @@
     'Extended2026D88' : 'Extended2026D88,Extended2026D88Reco',
     'DD4hepExtended2026D88' : 'DD4hepExtended2026D88,DD4hepExtended2026D88Reco',
     'Extended2026D91' : 'Extended2026D91,Extended2026D91Reco',
+    'DD4hepExtended2026D91' : 'DD4hepExtended2026D91,DD4hepExtended2026D91Reco',
     'Extended2026D92' : 'Extended2026D92,Extended2026D92Reco',
     'DD4hepExtended2026D92' : 'DD4hepExtended2026D92,DD4hepExtended2026D92Reco',
     'Extended2026D93' : 'Extended2026D93,Extended2026D93Reco',

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