From 21d049aed8b30b6e035bd48e5fc77a2620eb816f Mon Sep 17 00:00:00 2001 From: Sunanda Date: Tue, 21 Feb 2023 14:41:57 +0100 Subject: [PATCH] Fix the issue of 2026D91 which can now work in the dd4hep version --- .../Geometry/python/GeometryDD4hepExtended2026D91_cff.py | 2 +- Configuration/Geometry/python/GeometryExtended2026D91_cff.py | 2 +- Configuration/Geometry/python/dict2026Geometry.py | 2 +- Geometry/HcalCommonData/python/GeometryExtended2016Reco_cff.py | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D91_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D91_cff.py index 673615f6000fa..edd8c9acb69ac 100644 --- 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 index 8ce9c4494a79f..ac832f7703301 100644 --- 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 index 91b2664134bc9..3f3d2a597fafa 100644 --- 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 index deba77db50d4b..128e3c0723a11 100644 --- 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