From 41fbbb0ef5bad1338d040de09c9087769efd3b05 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Thu, 23 Feb 2023 17:50:39 +0100 Subject: [PATCH] Backport to 13_0_X to fix the issues of 2026D91 and 2026D94 --- .../Geometry/python/GeometryDD4hepExtended2026D91_cff.py | 2 +- .../Geometry/python/GeometryExtended2026D91_cff.py | 2 +- Configuration/Geometry/python/dict2026Geometry.py | 2 +- Configuration/StandardSequences/python/GeometryConf.py | 1 + .../python/hfnoseParametersInitialization_cfi.py | 8 +------- .../plugins/HGCalNumberingInitialization.cc | 2 ++ .../HcalCommonData/python/GeometryExtended2016Reco_cff.py | 1 - 7 files changed, 7 insertions(+), 11 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/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py index eea53bde5b345..ce5b957c10aaf 100644 --- a/Configuration/StandardSequences/python/GeometryConf.py +++ b/Configuration/StandardSequences/python/GeometryConf.py @@ -53,6 +53,7 @@ 'Extended2026D88' : 'Extended2026D88,Extended2026D88Reco', 'DD4hepExtended2026D88' : 'DD4hepExtended2026D88,DD4hepExtended2026D88Reco', 'Extended2026D91' : 'Extended2026D91,Extended2026D91Reco', + 'DD4hepExtended2026D91' : 'DD4hepExtended2026D91,DD4hepExtended2026D91Reco', 'Extended2026D92' : 'Extended2026D92,Extended2026D92Reco', 'DD4hepExtended2026D92' : 'DD4hepExtended2026D92,DD4hepExtended2026D92Reco', 'Extended2026D93' : 'Extended2026D93,Extended2026D93Reco', diff --git a/Geometry/ForwardCommonData/python/hfnoseParametersInitialization_cfi.py b/Geometry/ForwardCommonData/python/hfnoseParametersInitialization_cfi.py index 9e5a2194d73a9..6c10a8d3bc0c6 100644 --- a/Geometry/ForwardCommonData/python/hfnoseParametersInitialization_cfi.py +++ b/Geometry/ForwardCommonData/python/hfnoseParametersInitialization_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from Geometry.HGCalCommonData.hgcalEEParametersInitialize_cfi import * +from Geometry.HGCalCommonData.hgcalEEParametersInitialization_cfi import * hfnoseParametersInitialize = hgcalEEParametersInitialize.clone( name = "HGCalHFNoseSensitive", @@ -10,9 +10,3 @@ nameT = "HFNose", nameX = "HGCalHFNoseSensitive" ) - -from Configuration.ProcessModifiers.dd4hep_cff import dd4hep - -dd4hep.toModify(hfnoseParametersInitialize, - fromDD4hep = True -) diff --git a/Geometry/HGCalCommonData/plugins/HGCalNumberingInitialization.cc b/Geometry/HGCalCommonData/plugins/HGCalNumberingInitialization.cc index eba8976d41969..81f72e9433758 100644 --- a/Geometry/HGCalCommonData/plugins/HGCalNumberingInitialization.cc +++ b/Geometry/HGCalCommonData/plugins/HGCalNumberingInitialization.cc @@ -55,7 +55,9 @@ HGCalNumberingInitialization::~HGCalNumberingInitialization() {} // ------------ method called to produce the data ------------ HGCalNumberingInitialization::ReturnType HGCalNumberingInitialization::produce(const IdealGeometryRecord& iRecord) { +#ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "in HGCalNumberingInitialization::produce for " << name_; +#endif const auto& pHGpar = iRecord.get(hgParToken_); return std::make_unique(&pHGpar, name_); } 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