Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Phase2-gex154C Backport to 13_0_X to fix the issues of 2026D91 and 2026D94 #40862

Merged
merged 1 commit into from
Feb 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand Down
2 changes: 1 addition & 1 deletion Configuration/Geometry/python/dict2026Geometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -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" : [
Expand Down
1 change: 1 addition & 0 deletions Configuration/StandardSequences/python/GeometryConf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -10,9 +10,3 @@
nameT = "HFNose",
nameX = "HGCalHFNoseSensitive"
)

from Configuration.ProcessModifiers.dd4hep_cff import dd4hep

dd4hep.toModify(hfnoseParametersInitialize,
fromDD4hep = True
)
Original file line number Diff line number Diff line change
Expand Up @@ -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<HGCalDDDConstants>(&pHGpar, name_);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

#Tracker
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *
from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *

#Muon
Expand Down