Skip to content

Commit

Permalink
Merge pull request cms-sw#46311 from bsunanda/Run3-hcx374X
Browse files Browse the repository at this point in the history
Run3-hcx374X Update the scenarios for providing the correct set of initializing cfis -- backport of cms-sw#46310
  • Loading branch information
cmsbuild authored Oct 10, 2024
2 parents 0316922 + 90b1173 commit eae5c15
Show file tree
Hide file tree
Showing 85 changed files with 95 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *

# forward
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.ForwardGeometry.ZdcGeometry_cfi import *

# timing
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import FWCore.ParameterSet.Config as cms
from Configuration.Geometry.defaultPhase2ConditionsEra_cff import DEFAULT_VERSION

from Configuration.Geometry.GeometryDD4hepExtended2026D110Reco_cff import *
reco_dd4hep_geometry_import_stmt = f"from Configuration.Geometry.GeometryDD4hepExtended{DEFAULT_VERSION}Reco_cff import *"
exec(reco_dd4hep_geometry_import_stmt)
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import FWCore.ParameterSet.Config as cms
from Configuration.Geometry.defaultPhase2ConditionsEra_cff import DEFAULT_VERSION

from Configuration.Geometry.GeometryDD4hepExtended2026D110_cff import *
dd4hep_geometry_import_stmt = f"from Configuration.Geometry.GeometryDD4hepExtended{DEFAULT_VERSION}_cff import *"
exec(dd4hep_geometry_import_stmt)
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

1 change: 1 addition & 0 deletions Configuration/Geometry/python/GeometryExtended2021_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

Loading

0 comments on commit eae5c15

Please sign in to comment.