diff --git a/Configuration/Eras/python/Era_Phase2C6_timing_layer_bar_cff.py b/Configuration/Eras/python/Era_Phase2C6_timing_layer_bar_cff.py new file mode 100644 index 0000000000000..87cd5389df344 --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2C6_timing_layer_bar_cff.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.Eras.Era_Phase2C6_timing_cff import Phase2C6_timing +from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer +from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar + +Phase2C6_timing_layer_bar = cms.ModifierChain(Phase2C6_timing, phase2_timing_layer, phase2_timing_layer_bar) + diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md index 8d1023ac349aa..b764c8549ef56 100644 --- a/Configuration/Geometry/README.md +++ b/Configuration/Geometry/README.md @@ -5,16 +5,12 @@ Different versions of various subdetectors can be combined. The available versio Tracker: * T5: Phase2 tilted tracker (v6.1.3) w/ phase 2 pixel (v4.0.2.5) * T6: Phase2 tilted tracker (v6.1.4) w/ phase 2 pixel (v4.0.4) (TEDD slighly rotated + Inner Tracker barrel has lower radii than TDR T5 geometry) -* T11: Phase2 tilted tracker (v6.1.4) w/ phase 2 pixel (v4.0.5) (same as T6 but 50x50 in all modules) * T14: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v6.1.3) (Based from T12. OT: reduced envelope. IT: new chip size, different radii, 2x2 modules everywhere in TEPX, new ring paradigm in TEPX) * T15: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v6.1.3) (Active geometry: same as T14. Material Budget: major update in IT, gathering info from recent Mechanical designs.) Calorimeters: -* C3: HGCal (v8) + Phase2 HCAL and EB * C4: HGCal (v9) + Phase2 HCAL and EB -* C5: HGCal (v9 without virtual wafers) + Phase2 HCAL and EB * C6: HGCal (v9) + HFNose + Phase2 HCAL and EB -* C7: HGCal (v9a with inner support structure) + Phase2 HCAL and EB * C8: HGCal (v10 post TDR HGCal Geometry) + Phase2 HCAL and EB + Tracker cables in calorimeter region Muon system: @@ -22,15 +18,10 @@ Muon system: * M3: same as M2 with change to the number of iRPC strips from 192 to 96 as in TDR Fast Timing system: -* I1: No Fast Timing detector -* I2: Fast Timing detector (LYSO barrel, silicon endcap), only sensitive layers -* I3: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO tiles -* I4: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars * I5: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars along z flat -* I6: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars along z flat no hole between modules * I7: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars along phi flat -* I8: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars along phi flat, crystal thickness as I5 * I9: Same as I7 but with ETL in the position defined in O3 +* I10: Same as I9 w/ material adjustments The script also handles the common and forward elements of the geometry: * O2: detailed cavern description @@ -39,24 +30,10 @@ The script also handles the common and forward elements of the geometry: * F3: same as F2 but changes due to HFNose Several detector combinations have been generated: -* D17 = T5+C3+M2+I1+O2+F2 -* D19 = T5+C3+M2+I2+O2+F2 -* D21 = T6+C3+M2+I1+O2+F2 -* D24 = T6+C3+M2+I3+O2+F2 -* D25 = T6+C3+M2+I4+O2+F2 -* D28 = T6+C4+M2+I1+O2+F2 -* D29 = T11+C3+M2+I1+O2+F2 -* D30 = T6+C5+M2+I1+O2+F2 -* D31 = T6+C6+M2+I1+O2+F3 -* D32 = T6+C7+M2+I1+O2+F2 -* D33 = T6+C3+M2+I5+O2+F2 -* D34 = T6+C3+M2+I6+O2+F2 * D35 = T6+C4+M2+I5+O2+F2 -* D38 = T6+C4+M2+I7+O2+F2 -* D39 = T6+C4+M2+I8+O2+F2 -* D40 = T14+C3+M2+I1+O2+F2 * D41 = T14+C8+M3+I9+O3+F2 -* D42 = T15+C3+M2+I1+O2+F2 * D43 = T14+C4+M3+I7+O2+F2 +* D44 = T14+C6+M3+I7+O2+F2 +* D45 = T15+C8+M3+I10+O3+F2 -Currently, D17 is considered to be the baseline for the Phase 2 Muon and Barrel TDRs. +D35 is the baseline for the MTD TDR, and D41 is the baseline for the L1T TDR. diff --git a/Configuration/Geometry/python/GeometryExtended2023D17Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D17Reco_cff.py deleted file mode 100644 index 005239e11ac28..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D17Reco_cff.py +++ /dev/null @@ -1,50 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2023D17_cff import * - -# tracker -from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = cms.bool(False) - -# calo -from Geometry.CaloEventSetup.HGCalV6Topology_cfi import * -from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL" , - "ZDC" , - "EcalBarrel" , - "TOWER" , - "HGCalEESensitive" , - "HGCalHESiliconSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * -from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ForwardGeometry_cfi import * - diff --git a/Configuration/Geometry/python/GeometryExtended2023D17_cff.py b/Configuration/Geometry/python/GeometryExtended2023D17_cff.py deleted file mode 100644 index 3dc21ad564f9d..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D17_cff.py +++ /dev/null @@ -1,12 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2023D17XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT5_cff import * -from Geometry.HcalCommonData.hcalParameters_cfi import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * -from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023D19Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D19Reco_cff.py deleted file mode 100644 index 970975aee3cd7..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D19Reco_cff.py +++ /dev/null @@ -1,54 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2023D19_cff import * - -# tracker -from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = cms.bool(False) - -# calo -from Geometry.CaloEventSetup.HGCalV6Topology_cfi import * -from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL" , - "ZDC" , - "EcalBarrel" , - "TOWER" , - "HGCalEESensitive" , - "HGCalHESiliconSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * -from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ForwardGeometry_cfi import * - -# timing -from Geometry.CaloEventSetup.FastTimeTopology_cfi import * -from Geometry.HGCalGeometry.FastTimeGeometryESProducer_cfi import * - diff --git a/Configuration/Geometry/python/GeometryExtended2023D19_cff.py b/Configuration/Geometry/python/GeometryExtended2023D19_cff.py deleted file mode 100644 index 80f474920e29d..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D19_cff.py +++ /dev/null @@ -1,14 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2023D19XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT5_cff import * -from Geometry.HcalCommonData.hcalParameters_cfi import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * -from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi import * -from Geometry.HGCalCommonData.fastTimeParametersInitialization_cfi import * -from Geometry.HGCalCommonData.fastTimeNumberingInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023D21Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D21Reco_cff.py deleted file mode 100644 index 0f0ea2e904104..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D21Reco_cff.py +++ /dev/null @@ -1,50 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2023D21_cff import * - -# tracker -from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = cms.bool(False) - -# calo -from Geometry.CaloEventSetup.HGCalV6Topology_cfi import * -from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL" , - "ZDC" , - "EcalBarrel" , - "TOWER" , - "HGCalEESensitive" , - "HGCalHESiliconSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * -from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ForwardGeometry_cfi import * - diff --git a/Configuration/Geometry/python/GeometryExtended2023D21_cff.py b/Configuration/Geometry/python/GeometryExtended2023D21_cff.py deleted file mode 100644 index eed293e4a8755..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D21_cff.py +++ /dev/null @@ -1,12 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2023D21XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import * -from Geometry.HcalCommonData.hcalParameters_cfi import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * -from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023D24Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D24Reco_cff.py deleted file mode 100644 index 7a2ede9f9da53..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D24Reco_cff.py +++ /dev/null @@ -1,59 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2023D24_cff import * - -# tracker -from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = cms.bool(False) - -# calo -from Geometry.CaloEventSetup.HGCalV6Topology_cfi import * -from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL" , - "ZDC" , - "EcalBarrel" , - "TOWER" , - "HGCalEESensitive" , - "HGCalHESiliconSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * -from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ForwardGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cfi import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = cms.bool(False) - diff --git a/Configuration/Geometry/python/GeometryExtended2023D24_cff.py b/Configuration/Geometry/python/GeometryExtended2023D24_cff.py deleted file mode 100644 index 5b9db74cf786f..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D24_cff.py +++ /dev/null @@ -1,13 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2023D24XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import * -from Geometry.HcalCommonData.hcalParameters_cfi import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * -from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023D25Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D25Reco_cff.py deleted file mode 100644 index 2117096f864f6..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D25Reco_cff.py +++ /dev/null @@ -1,59 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2023D25_cff import * - -# tracker -from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = cms.bool(False) - -# calo -from Geometry.CaloEventSetup.HGCalV6Topology_cfi import * -from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL" , - "ZDC" , - "EcalBarrel" , - "TOWER" , - "HGCalEESensitive" , - "HGCalHESiliconSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * -from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ForwardGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cfi import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = cms.bool(False) - diff --git a/Configuration/Geometry/python/GeometryExtended2023D25_cff.py b/Configuration/Geometry/python/GeometryExtended2023D25_cff.py deleted file mode 100644 index 398c700064922..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D25_cff.py +++ /dev/null @@ -1,13 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2023D25XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import * -from Geometry.HcalCommonData.hcalParameters_cfi import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * -from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023D28Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D28Reco_cff.py deleted file mode 100644 index 9d766c4b8823f..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D28Reco_cff.py +++ /dev/null @@ -1,51 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2023D28_cff import * - -# tracker -from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = cms.bool(False) - -# calo -from Geometry.CaloEventSetup.HGCalV9Topology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * -from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ForwardGeometry_cfi import * - diff --git a/Configuration/Geometry/python/GeometryExtended2023D28_cff.py b/Configuration/Geometry/python/GeometryExtended2023D28_cff.py deleted file mode 100644 index 3a5fa5f0ca7b3..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D28_cff.py +++ /dev/null @@ -1,12 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2023D28XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import * -from Geometry.HcalCommonData.hcalParameters_cfi import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023D29Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D29Reco_cff.py deleted file mode 100644 index 5a7f7dc45e31f..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D29Reco_cff.py +++ /dev/null @@ -1,50 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2023D29_cff import * - -# tracker -from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = cms.bool(False) - -# calo -from Geometry.CaloEventSetup.HGCalV6Topology_cfi import * -from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL" , - "ZDC" , - "EcalBarrel" , - "TOWER" , - "HGCalEESensitive" , - "HGCalHESiliconSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * -from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ForwardGeometry_cfi import * - diff --git a/Configuration/Geometry/python/GeometryExtended2023D29_cff.py b/Configuration/Geometry/python/GeometryExtended2023D29_cff.py deleted file mode 100644 index 7da7ce76e47e1..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D29_cff.py +++ /dev/null @@ -1,12 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2023D29XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import * -from Geometry.HcalCommonData.hcalParameters_cfi import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * -from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023D30Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D30Reco_cff.py deleted file mode 100644 index 08222612c649d..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D30Reco_cff.py +++ /dev/null @@ -1,51 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2023D30_cff import * - -# tracker -from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = cms.bool(False) - -# calo -from Geometry.CaloEventSetup.HGCalV9Topology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * -from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ForwardGeometry_cfi import * - diff --git a/Configuration/Geometry/python/GeometryExtended2023D30_cff.py b/Configuration/Geometry/python/GeometryExtended2023D30_cff.py deleted file mode 100644 index 3ab042cdf83cb..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D30_cff.py +++ /dev/null @@ -1,12 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2023D30XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import * -from Geometry.HcalCommonData.hcalParameters_cfi import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023D31Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D31Reco_cff.py deleted file mode 100644 index 595c7d0c0648b..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D31Reco_cff.py +++ /dev/null @@ -1,54 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2023D31_cff import * - -# tracker -from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = cms.bool(False) - -# calo -from Geometry.CaloEventSetup.HGCalV9Topology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.HFNoseTopology_cfi import * -from Geometry.ForwardGeometry.HFNoseGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive", - "HGCalHFNoseSensitive", - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * -from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ForwardGeometry_cfi import * - diff --git a/Configuration/Geometry/python/GeometryExtended2023D32Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D32Reco_cff.py deleted file mode 100644 index 4973b796934f7..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D32Reco_cff.py +++ /dev/null @@ -1,51 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2023D32_cff import * - -# tracker -from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = cms.bool(False) - -# calo -from Geometry.CaloEventSetup.HGCalV9Topology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * -from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ForwardGeometry_cfi import * - diff --git a/Configuration/Geometry/python/GeometryExtended2023D32_cff.py b/Configuration/Geometry/python/GeometryExtended2023D32_cff.py deleted file mode 100644 index 7bb077d25b451..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D32_cff.py +++ /dev/null @@ -1,12 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2023D32XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import * -from Geometry.HcalCommonData.hcalParameters_cfi import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023D33Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D33Reco_cff.py deleted file mode 100644 index 5e9a8bf274adc..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D33Reco_cff.py +++ /dev/null @@ -1,59 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2023D33_cff import * - -# tracker -from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = cms.bool(False) - -# calo -from Geometry.CaloEventSetup.HGCalV6Topology_cfi import * -from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL" , - "ZDC" , - "EcalBarrel" , - "TOWER" , - "HGCalEESensitive" , - "HGCalHESiliconSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * -from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ForwardGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cfi import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = cms.bool(False) - diff --git a/Configuration/Geometry/python/GeometryExtended2023D33_cff.py b/Configuration/Geometry/python/GeometryExtended2023D33_cff.py deleted file mode 100644 index 2180604a9246b..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D33_cff.py +++ /dev/null @@ -1,13 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2023D33XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import * -from Geometry.HcalCommonData.hcalParameters_cfi import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * -from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023D34Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D34Reco_cff.py deleted file mode 100644 index 7170538cc0b78..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D34Reco_cff.py +++ /dev/null @@ -1,59 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2023D34_cff import * - -# tracker -from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = cms.bool(False) - -# calo -from Geometry.CaloEventSetup.HGCalV6Topology_cfi import * -from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL" , - "ZDC" , - "EcalBarrel" , - "TOWER" , - "HGCalEESensitive" , - "HGCalHESiliconSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * -from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ForwardGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cfi import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = cms.bool(False) - diff --git a/Configuration/Geometry/python/GeometryExtended2023D34_cff.py b/Configuration/Geometry/python/GeometryExtended2023D34_cff.py deleted file mode 100644 index 94ead3e085acc..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D34_cff.py +++ /dev/null @@ -1,13 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2023D34XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import * -from Geometry.HcalCommonData.hcalParameters_cfi import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * -from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023D38_cff.py b/Configuration/Geometry/python/GeometryExtended2023D38_cff.py deleted file mode 100644 index fcdbf5032e778..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D38_cff.py +++ /dev/null @@ -1,13 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2023D38XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import * -from Geometry.HcalCommonData.hcalParameters_cfi import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023D40Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D40Reco_cff.py deleted file mode 100644 index 5cc5f32301f7e..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D40Reco_cff.py +++ /dev/null @@ -1,50 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2023D40_cff import * - -# tracker -from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = cms.bool(False) - -# calo -from Geometry.CaloEventSetup.HGCalV6Topology_cfi import * -from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL" , - "ZDC" , - "EcalBarrel" , - "TOWER" , - "HGCalEESensitive" , - "HGCalHESiliconSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * -from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ForwardGeometry_cfi import * - diff --git a/Configuration/Geometry/python/GeometryExtended2023D40_cff.py b/Configuration/Geometry/python/GeometryExtended2023D40_cff.py deleted file mode 100644 index c9bc66db1d314..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D40_cff.py +++ /dev/null @@ -1,12 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2023D40XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import * -from Geometry.HcalCommonData.hcalParameters_cfi import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * -from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023D42Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D42Reco_cff.py deleted file mode 100644 index d9643f0818cb8..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D42Reco_cff.py +++ /dev/null @@ -1,50 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2023D42_cff import * - -# tracker -from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = cms.bool(False) - -# calo -from Geometry.CaloEventSetup.HGCalV6Topology_cfi import * -from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL" , - "ZDC" , - "EcalBarrel" , - "TOWER" , - "HGCalEESensitive" , - "HGCalHESiliconSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * -from Geometry.GEMGeometryBuilder.me0Geometry_cfi import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ForwardGeometry_cfi import * - diff --git a/Configuration/Geometry/python/GeometryExtended2023D42_cff.py b/Configuration/Geometry/python/GeometryExtended2023D42_cff.py deleted file mode 100644 index 578eeba84e072..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2023D42_cff.py +++ /dev/null @@ -1,12 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2023D42XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import * -from Geometry.HcalCommonData.hcalParameters_cfi import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * -from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023D38Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D44Reco_cff.py similarity index 89% rename from Configuration/Geometry/python/GeometryExtended2023D38Reco_cff.py rename to Configuration/Geometry/python/GeometryExtended2023D44Reco_cff.py index a27659a44970c..99dfe883eb595 100644 --- a/Configuration/Geometry/python/GeometryExtended2023D38Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023D44Reco_cff.py @@ -3,7 +3,7 @@ # This config was generated automatically using generate2023Geometry.py # If you notice a mistake, please update the generating script, not just this config -from Configuration.Geometry.GeometryExtended2023D38_cff import * +from Configuration.Geometry.GeometryExtended2023D44_cff import * # tracker from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * @@ -16,6 +16,8 @@ # calo from Geometry.CaloEventSetup.HGCalV9Topology_cfi import * from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * +from Geometry.CaloEventSetup.HFNoseTopology_cfi import * +from Geometry.ForwardGeometry.HFNoseGeometryESProducer_cfi import * from Geometry.CaloEventSetup.CaloTopology_cfi import * from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", @@ -25,7 +27,8 @@ "TOWER", "HGCalEESensitive", "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive" + "HGCalHEScintillatorSensitive", + "HGCalHFNoseSensitive", ) ) from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023D31_cff.py b/Configuration/Geometry/python/GeometryExtended2023D44_cff.py similarity index 77% rename from Configuration/Geometry/python/GeometryExtended2023D31_cff.py rename to Configuration/Geometry/python/GeometryExtended2023D44_cff.py index 8b3f86c665e39..d15b3b2e7ee35 100644 --- a/Configuration/Geometry/python/GeometryExtended2023D31_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023D44_cff.py @@ -3,13 +3,13 @@ # This config was generated automatically using generate2023Geometry.py # If you notice a mistake, please update the generating script, not just this config -from Geometry.CMSCommonData.cmsExtendedGeometry2023D31XML_cfi import * +from Geometry.CMSCommonData.cmsExtendedGeometry2023D44XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import * +from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import * from Geometry.HcalCommonData.hcalParameters_cfi import * from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * from Geometry.ForwardCommonData.hfnoseParametersInitialization_cfi import * from Geometry.ForwardCommonData.hfnoseNumberingInitialization_cfi import * - +from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023D39Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D45Reco_cff.py similarity index 97% rename from Configuration/Geometry/python/GeometryExtended2023D39Reco_cff.py rename to Configuration/Geometry/python/GeometryExtended2023D45Reco_cff.py index 5c3719de99e6d..a54f098400f22 100644 --- a/Configuration/Geometry/python/GeometryExtended2023D39Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023D45Reco_cff.py @@ -3,7 +3,7 @@ # This config was generated automatically using generate2023Geometry.py # If you notice a mistake, please update the generating script, not just this config -from Configuration.Geometry.GeometryExtended2023D39_cff import * +from Configuration.Geometry.GeometryExtended2023D45_cff import * # tracker from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023D39_cff.py b/Configuration/Geometry/python/GeometryExtended2023D45_cff.py similarity index 81% rename from Configuration/Geometry/python/GeometryExtended2023D39_cff.py rename to Configuration/Geometry/python/GeometryExtended2023D45_cff.py index a6c19b222cf4a..30dcad325f126 100644 --- a/Configuration/Geometry/python/GeometryExtended2023D39_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023D45_cff.py @@ -3,9 +3,9 @@ # This config was generated automatically using generate2023Geometry.py # If you notice a mistake, please update the generating script, not just this config -from Geometry.CMSCommonData.cmsExtendedGeometry2023D39XML_cfi import * +from Geometry.CMSCommonData.cmsExtendedGeometry2023D45XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import * +from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import * from Geometry.HcalCommonData.hcalParameters_cfi import * from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Configuration/Geometry/python/dict2023Geometry.py b/Configuration/Geometry/python/dict2023Geometry.py index 1a9485116ff16..08f183ac9413c 100644 --- a/Configuration/Geometry/python/dict2023Geometry.py +++ b/Configuration/Geometry/python/dict2023Geometry.py @@ -31,7 +31,6 @@ ], "era" : "run2_common, run3_common, phase2_common", }, - "O3" : { 1 : [ 'Geometry/CMSCommonData/data/materials.xml', @@ -134,41 +133,6 @@ ], "era" : "phase2_tracker, trackingPhase2PU140", }, - "T11" : { - 1 : [ - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker405/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - ], - "sim" : [ - 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *', - 'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import *', - ], - "reco" : [ - 'from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *', - 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', - 'from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *', - 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', - 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', - 'trackerGeometry.applyAlignment = cms.bool(False)', - ], - "era" : "phase2_tracker, trackingPhase2PU140", - }, "T14" : { 1 : [ 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', @@ -244,80 +208,7 @@ caloDict = { "abbrev" : "C", "name" : "calo", - "default" : 3, - "C3" : { - 1 : [ - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalendcap/SSAbsorber/hcalendcapalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/2023/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml', - ], - 3 : [ - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv8.xml', - 'Geometry/HGCalSimData/data/hgccons.xml', - 'Geometry/HGCalSimData/data/hgcProdCuts.xml', - ], - 4 : [ - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - ], - "sim" : [ - 'from Geometry.HcalCommonData.hcalParameters_cfi import *', - 'from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *', - 'from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import *', - 'from Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi import *' - ], - "reco" : [ - 'from Geometry.CaloEventSetup.HGCalV6Topology_cfi import *', - 'from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_cfi import *', - 'from Geometry.CaloEventSetup.CaloTopology_cfi import *', - 'from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *', - 'CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",', - ' SelectedCalos = cms.vstring("HCAL" ,', - ' "ZDC" ,', - ' "EcalBarrel" ,', - ' "TOWER" ,', - ' "HGCalEESensitive" ,', - ' "HGCalHESiliconSensitive" ', - ' )', - ')', - 'from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *', - 'from Geometry.HcalEventSetup.HcalGeometry_cfi import *', - 'from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *', - 'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *', - 'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *', - 'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *', - 'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *', - 'from Geometry.EcalMapping.EcalMapping_cfi import *', - 'from Geometry.EcalMapping.EcalMappingRecord_cfi import *', - ], - "era" : "run2_HE_2017, run2_HF_2017, run2_HCAL_2017, run3_HB, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, hcalSkipPacker", - }, - + "default" : 4, "C4" : { 1 : [ 'Geometry/EcalCommonData/data/ectkcable.xml', @@ -392,82 +283,6 @@ ], "era" : "run2_HE_2017, run2_HF_2017, run2_HCAL_2017, run3_HB, phase2_hcal, phase2_hgcal, phase2_hgcalV9, hcalHardcodeConditions, hcalSkipPacker", }, - - "C5" : { - 1 : [ - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/NoHE/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v9p/hgcalCons.xml', - ], - 3 : [ - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv9.xml', - ], - 4 : [ - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv9.xml', - ], - "sim" : [ - 'from Geometry.HcalCommonData.hcalParameters_cfi import *', - 'from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *', - 'from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *', - 'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *' - ], - "reco" : [ - 'from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *', - 'from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *', - 'from Geometry.CaloEventSetup.CaloTopology_cfi import *', - 'from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *', - 'CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",', - ' SelectedCalos = cms.vstring("HCAL",', - ' "ZDC",', - ' "EcalBarrel",', - ' "TOWER",', - ' "HGCalEESensitive",', - ' "HGCalHESiliconSensitive",', - ' "HGCalHEScintillatorSensitive"', - ' )', - ')', - 'from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *', - 'from Geometry.HcalEventSetup.HcalGeometry_cfi import *', - 'from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *', - 'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *', - 'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *', - 'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *', - 'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *', - 'from Geometry.EcalMapping.EcalMapping_cfi import *', - 'from Geometry.EcalMapping.EcalMappingRecord_cfi import *', - ], - "era" : "run2_HE_2017, run2_HF_2017, run2_HCAL_2017, run3_HB, phase2_hcal, phase2_hgcal, phase2_hgcalV9, hcalHardcodeConditions, hcalSkipPacker", - }, - "C6" : { 1 : [ 'Geometry/EcalCommonData/data/ectkcable.xml', @@ -553,82 +368,6 @@ ], "era" : "run2_HE_2017, run2_HF_2017, run2_HCAL_2017, run3_HB, phase2_hcal, phase2_hgcal, phase2_hgcalV9, hcalHardcodeConditions, hcalSkipPacker, phase2_hfnose", }, - - "C7" : { - 1 : [ - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/NoHE/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v9a/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v9a/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v9a/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v9a/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v9a/hgcalCons.xml', - ], - 3 : [ - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv9.xml', - ], - 4 : [ - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv9.xml', - ], - "sim" : [ - 'from Geometry.HcalCommonData.hcalParameters_cfi import *', - 'from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *', - 'from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *', - 'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *' - ], - "reco" : [ - 'from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *', - 'from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *', - 'from Geometry.CaloEventSetup.CaloTopology_cfi import *', - 'from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *', - 'CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",', - ' SelectedCalos = cms.vstring("HCAL",', - ' "ZDC",', - ' "EcalBarrel",', - ' "TOWER",', - ' "HGCalEESensitive",', - ' "HGCalHESiliconSensitive",', - ' "HGCalHEScintillatorSensitive"', - ' )', - ')', - 'from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *', - 'from Geometry.HcalEventSetup.HcalGeometry_cfi import *', - 'from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *', - 'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *', - 'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *', - 'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *', - 'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *', - 'from Geometry.EcalMapping.EcalMapping_cfi import *', - 'from Geometry.EcalMapping.EcalMappingRecord_cfi import *', - ], - "era" : "run2_HE_2017, run2_HF_2017, run2_HCAL_2017, run3_HB, phase2_hcal, phase2_hgcal, phase2_hgcalV9, hcalHardcodeConditions, hcalSkipPacker", - }, - "C8" : { 1 : [ 'Geometry/EcalCommonData/data/eregalgo/2023/v2/eregalgo.xml', @@ -751,7 +490,6 @@ ], "era" : "phase2_muon, run3_GEM", }, - "M3" : { 1 : [ 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', @@ -826,7 +564,6 @@ 'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *', ] }, - "F3" : { 1 : [ 'Geometry/ForwardCommonData/data/forwardshield/2023/v1/forwardshield.xml', @@ -860,86 +597,7 @@ timingDict = { "abbrev" : "I", "name" : "timing", - "default" : 1, - "I1" : {}, - "I2" : { - 1 : [ - 'Geometry/HGCalCommonData/data/fastTimingBarrel.xml', - 'Geometry/HGCalCommonData/data/fastTimingEndcap.xml', - 'Geometry/HGCalCommonData/data/fastTimingElement.xml', - ], - 3 : [ - 'Geometry/HGCalSimData/data/fasttimesens.xml' - ], - 4 : [ - 'Geometry/HGCalSimData/data/fasttimeProdCuts.xml' - ], - "sim" : [ - 'from Geometry.HGCalCommonData.fastTimeParametersInitialization_cfi import *', - 'from Geometry.HGCalCommonData.fastTimeNumberingInitialization_cfi import *', - ], - "reco" :[ - 'from Geometry.CaloEventSetup.FastTimeTopology_cfi import *', - 'from Geometry.HGCalGeometry.FastTimeGeometryESProducer_cfi import *', - ], - "era" : "phase2_timing, phase2_timing_layer", - }, - "I3" : { - 1 : [ - 'Geometry/MTDCommonData/data/btl.xml', - 'Geometry/MTDCommonData/data/etl.xml', - 'Geometry/MTDCommonData/data/CrystalTile/mtd.xml', - 'Geometry/MTDCommonData/data/CrystalTile/mtdStructureTopology.xml', - 'Geometry/MTDCommonData/data/CrystalTile/mtdParameters.xml', - ], - 3 : [ - 'Geometry/MTDSimData/data/CrystalTile/mtdsens.xml' - ], - 4 : [ - 'Geometry/MTDSimData/data/CrystalTile/mtdProdCuts.xml' - ], - "sim" : [ - 'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *', - ], - "reco" :[ - 'from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *', - 'from Geometry.MTDGeometryBuilder.mtdParameters_cfi import *', - 'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *', - 'from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *', - 'from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *', - 'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *', - 'mtdGeometry.applyAlignment = cms.bool(False)' - ], - "era" : "phase2_timing, phase2_timing_layer_tile", - }, - "I4" : { - 1 : [ - 'Geometry/MTDCommonData/data/btl.xml', - 'Geometry/MTDCommonData/data/etl.xml', - 'Geometry/MTDCommonData/data/CrystalBar/mtd.xml', - 'Geometry/MTDCommonData/data/CrystalBar/mtdStructureTopology.xml', - 'Geometry/MTDCommonData/data/CrystalBar/mtdParameters.xml', - ], - 3 : [ - 'Geometry/MTDSimData/data/CrystalBar/mtdsens.xml' - ], - 4 : [ - 'Geometry/MTDSimData/data/CrystalBar/mtdProdCuts.xml' - ], - "sim" : [ - 'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *', - ], - "reco" :[ - 'from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *', - 'from Geometry.MTDGeometryBuilder.mtdParameters_cfi import *', - 'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *', - 'from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *', - 'from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *', - 'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *', - 'mtdGeometry.applyAlignment = cms.bool(False)' - ], - "era" : "phase2_timing, phase2_timing_layer_bar", - }, + "default" : 5, "I5" : { 1 : [ 'Geometry/MTDCommonData/data/btl.xml', @@ -968,34 +626,6 @@ ], "era" : "phase2_timing, phase2_timing_layer_bar", }, - "I6" : { - 1 : [ - 'Geometry/MTDCommonData/data/btl.xml', - 'Geometry/MTDCommonData/data/etl.xml', - 'Geometry/MTDCommonData/data/CrystalBarZflatNOhole/mtd.xml', - 'Geometry/MTDCommonData/data/CrystalBarZflatNOhole/mtdStructureTopology.xml', - 'Geometry/MTDCommonData/data/CrystalBarZflatNOhole/mtdParameters.xml', - ], - 3 : [ - 'Geometry/MTDSimData/data/CrystalBarZflat/mtdsens.xml' - ], - 4 : [ - 'Geometry/MTDSimData/data/CrystalBarZflat/mtdProdCuts.xml' - ], - "sim" : [ - 'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *', - ], - "reco" :[ - 'from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *', - 'from Geometry.MTDGeometryBuilder.mtdParameters_cfi import *', - 'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *', - 'from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *', - 'from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *', - 'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *', - 'mtdGeometry.applyAlignment = cms.bool(False)' - ], - "era" : "phase2_timing, phase2_timing_layer_bar", - }, "I7" : { 1 : [ 'Geometry/MTDCommonData/data/btl.xml', @@ -1024,13 +654,13 @@ ], "era" : "phase2_timing, phase2_timing_layer_bar", }, - "I8" : { + "I9" : { 1 : [ 'Geometry/MTDCommonData/data/btl.xml', - 'Geometry/MTDCommonData/data/etl.xml', - 'Geometry/MTDCommonData/data/CrystalBarPhiFlatOldTh/mtd.xml', - 'Geometry/MTDCommonData/data/CrystalBarPhiFlatOldTh/mtdStructureTopology.xml', - 'Geometry/MTDCommonData/data/CrystalBarPhiFlatOldTh/mtdParameters.xml', + 'Geometry/MTDCommonData/data/etl/v2/etl.xml', + 'Geometry/MTDCommonData/data/CrystalBarPhiFlat/v2/mtd.xml', + 'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml', + 'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml', ], 3 : [ 'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml' @@ -1052,12 +682,11 @@ ], "era" : "phase2_timing, phase2_timing_layer_bar", }, - - "I9" : { + "I10" : { 1 : [ 'Geometry/MTDCommonData/data/btl.xml', 'Geometry/MTDCommonData/data/etl/v2/etl.xml', - 'Geometry/MTDCommonData/data/CrystalBarPhiFlat/v2/mtd.xml', + 'Geometry/MTDCommonData/data/CrystalBarPhiFlat/v3/mtd.xml', 'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml', 'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml', ], @@ -1086,26 +715,12 @@ allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict, timingDict ] detectorVersionDict = { - ("O2","T5","C3","M2","F2","I1") : "D17", - ("O2","T5","C3","M2","F2","I2") : "D19", - ("O2","T6","C3","M2","F2","I1") : "D21", - ("O2","T6","C3","M2","F2","I3") : "D24", - ("O2","T6","C3","M2","F2","I4") : "D25", - ("O2","T6","C4","M2","F2","I1") : "D28", - ("O2","T11","C3","M2","F2","I1") : "D29", - ("O2","T6","C5","M2","F2","I1") : "D30", - ("O2","T6","C6","M2","F3","I1") : "D31", - ("O2","T6","C7","M2","F2","I1") : "D32", - ("O2","T6","C3","M2","F2","I5") : "D33", - ("O2","T6","C3","M2","F2","I6") : "D34", ("O2","T6","C4","M2","F2","I5") : "D35", - ("O2","T6","C4","M2","F2","I7") : "D38", - ("O2","T6","C4","M2","F2","I8") : "D39", - ("O2","T14","C3","M2","F2","I1") : "D40", ("O3","T14","C8","M3","F2","I9") : "D41", - ("O2","T15","C3","M2","F2","I1") : "D42", ("O2","T14","C4","M3","F2","I7") : "D43", + ("O2","T14","C6","M3","F2","I7") : "D44", + ("O3","T15","C8","M3","F2","I10") : "D45", } -deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D18", "D20", "D22", "D23", "D26", "D27", "D36", "D37" ]) -deprecatedSubdets = set([ "T1", "T2" ,"T3", "T4", "T7", "T8", "T9", "T10", "T12", "T13", "C1", "C2", "M1", "O1", "F1" ]) +deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42" ]) +deprecatedSubdets = set([ "T1", "T2" ,"T3", "T4", "T7", "T8", "T9", "T10", "T11", "T12", "T13", "C1", "C2", "C3", "C5", "C7", "M1", "I1", "I2", "I3", "I4", "I6", "I8", "O1", "F1" ]) diff --git a/Configuration/PyReleaseValidation/python/relval_2023.py b/Configuration/PyReleaseValidation/python/relval_2023.py index b9bf62601f55b..8f2a653fd739a 100644 --- a/Configuration/PyReleaseValidation/python/relval_2023.py +++ b/Configuration/PyReleaseValidation/python/relval_2023.py @@ -13,18 +13,14 @@ #just define all of them #2023 WFs to run in IB (TTbar, TTbar+Timing) -numWFIB = [20034.0,20034.1,20034.11] #2023D17 w/ special tracking and timing workflows -numWFIB.extend([20261.97]) # 2023D17 premixing stage1 (NuGun+PU) -numWFIB.extend([20234.99]) # 2023D17 premixing combined stage1+stage2 (ttbar+PU) -numWFIB.extend([20434.0]) #2023D19 (already has timing) -numWFIB.extend([21234.0,21234.11]) #2023D21 -numWFIB.extend([22434.0]) #2023D24 -numWFIB.extend([24034.0]) #2023D28 -numWFIB.extend([27434.0,27434.21,27634.21]) #2023D35, prodlike, prodlike PU -numWFIB.extend([27834.0]) #2023D38 -numWFIB.extend([28634.0]) #2023D40 -numWFIB.extend([29034.0,29093.52]) #2023D41,2023D41+TICL -numWFIB.extend([29434.0]) #2023D42 -numWFIB.extend([29834.0]) #2023D43 +numWFIB = [20034.0] #2023D35 +numWFIB.extend([20434.0,20434.1]) #2023D41 w/ special tracking and timing workflows +numWFIB.extend([20661.97]) # 2023D41 premixing stage1 (NuGun+PU) +numWFIB.extend([20634.99]) # 2023D41 premixing combined stage1+stage2 (ttbar+PU) +numWFIB.extend([20434.21,20634.21]) #2023D41 prodlike, prodlike PU +numWFIB.extend([20493.52]) #2023D41+TICL +numWFIB.extend([20834.0]) #2023D43 +numWFIB.extend([21234.0]) #2023D44 +numWFIB.extend([21634.0]) #2023D45 for numWF in numWFIB: workflows[numWF] = _upgrade_workflows[numWF] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index c786ab4bde732..9622b40ad1486 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -2985,31 +2985,15 @@ def gen2018HiMix(fragment,howMuch): from Configuration.PyReleaseValidation.upgradeWorkflowComponents import * -defaultDataSets={} +# imported from above, only non-empty values should be provided here defaultDataSets['2017']='CMSSW_10_6_0-106X_mc2017_realistic_v3-v' defaultDataSets['2017Design']='CMSSW_10_0_0_pre2-100X_mc2017_design_IdealBS_v1-v' defaultDataSets['2018']='CMSSW_10_6_0-106X_upgrade2018_realistic_v4-v' defaultDataSets['2018Design']='CMSSW_10_6_0-106X_upgrade2018_design_v3-v' defaultDataSets['2021']='CMSSW_10_6_0-106X_upgrade2021_realistic_v5_LowSigmaZGTv5-v' defaultDataSets['2021Design']='CMSSW_10_6_0_pre3-105X_postLS2_realistic_v6-v' -defaultDataSets['2023D17']='CMSSW_10_2_0_pre2-101X_upgrade2023_realistic_v5_2023D17noPU-v' -defaultDataSets['2023D19']='' -defaultDataSets['2023D21']='' -defaultDataSets['2023D24']='' -defaultDataSets['2023D25']='' -defaultDataSets['2023D28']='' -defaultDataSets['2023D29']='' -defaultDataSets['2023D30']='' -defaultDataSets['2023D31']='' -defaultDataSets['2023D33']='' -defaultDataSets['2023D34']='' defaultDataSets['2023D35']='CMSSW_10_4_0_mtd3-103X_upgrade2023_realistic_v2_2023D35noPU_2-v' -defaultDataSets['2023D38']='' -defaultDataSets['2023D39']='' -defaultDataSets['2023D40']='' -defaultDataSets['2023D41']='' -defaultDataSets['2023D42']='' -defaultDataSets['2023D43']='' +defaultDataSets['2023D41']='CMSSW_10_6_0_patch2-106X_upgrade2023_realistic_v3_2023D41noPU-v' keys=defaultDataSets.keys() for key in keys: @@ -3229,13 +3213,6 @@ def gen2018HiMix(fragment,howMuch): if 'Reco' in step and upgradeStepDict[step][k]['--era']=='Run2_2017': upgradeStepDict[stepName][k] = merge([{'--era': 'Run2_2017_trackingLowPU'}, upgradeStepDict[step][k]]) - for step in upgradeSteps['Timing']['steps']: - stepName = step + upgradeSteps['Timing']['suffix'] - upgradeStepDict[stepName][k] = deepcopy(upgradeStepDict[step][k]) - # avoid some nonsense - if '--era' in upgradeStepDict[stepName][k].keys() and not "_timing" in upgradeStepDict[stepName][k]['--era']: - upgradeStepDict[stepName][k]['--era'] += "_timing" - for step in upgradeSteps['Neutron']['steps']: if 'GenSim' in step: custNew = "SimG4Core/Application/NeutronBGforMuonsXS_cff.customise" diff --git a/Configuration/PyReleaseValidation/python/relval_upgrade.py b/Configuration/PyReleaseValidation/python/relval_upgrade.py index bf8962fd0fea9..93e41e4f87444 100644 --- a/Configuration/PyReleaseValidation/python/relval_upgrade.py +++ b/Configuration/PyReleaseValidation/python/relval_upgrade.py @@ -15,7 +15,7 @@ def makeStepNameSim(key,frag,step,suffix): def makeStepName(key,frag,step,suffix): return step+suffix+'_'+key -neutronKeys = ['2023D17','2023D19','2023D21','2023D24','2023D25','2023D28','2023D29','2023D30','2023D31','2023D33','2023D34','2023D35','2023D38','2023D39','2023D40','2023D41','2023D42','2023D43'] +neutronKeys = [x for x in upgradeKeys[2023] if 'PU' not in x] neutronFrags = ['ZMM_14','MinBias_14TeV'] tbmFrags = ['TTbar_13','ZMM_13'] @@ -68,10 +68,6 @@ def makeStepName(key,frag,step,suffix): workflows[numWF] = [ upgradeDatasetFromFragment[frag], stepList['baseline']] - # only keep some special workflows for timing - if upgradeDatasetFromFragment[frag]=="TTbar_14TeV" and '2023' in key: - workflows[numWF+upgradeSteps['Timing']['offset']] = [ upgradeDatasetFromFragment[frag]+"_Timing", stepList['Timing']] - # special workflows for neutron bkg sim if any(upgradeDatasetFromFragment[frag]==nfrag for nfrag in neutronFrags) and any(nkey in key for nkey in neutronKeys): workflows[numWF+upgradeSteps['Neutron']['offset']] = [ upgradeDatasetFromFragment[frag]+"_Neutron", stepList['Neutron']] diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 375d9cc15621b..b2ed855e6d6d2 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -20,42 +20,16 @@ ] upgradeKeys[2023] = [ - '2023D17', - '2023D17PU', - '2023D19', - '2023D19PU', - '2023D21', - '2023D21PU', - '2023D24', - '2023D24PU', - '2023D25', - '2023D25PU', - '2023D28', - '2023D28PU', - '2023D29', - '2023D29PU', - '2023D30', - '2023D30PU', - '2023D31', - '2023D31PU', - '2023D33', - '2023D33PU', - '2023D34', - '2023D34PU', '2023D35', '2023D35PU', - '2023D38', - '2023D38PU', - '2023D39', - '2023D39PU', - '2023D40', - '2023D40PU', '2023D41', '2023D41PU', - '2023D42', - '2023D42PU', '2023D43', '2023D43PU', + '2023D44', + '2023D44PU', + '2023D45', + '2023D45PU', ] # pre-generation of WF numbers @@ -65,7 +39,7 @@ } numWFSkip=200 # temporary measure to keep other WF numbers the same -numWFConflict = [[20800,21200],[21600,22400],[23200,24000],[25000,26000],[50000,51000]] +numWFConflict = [[25000,26000],[50000,51000]] numWFAll={ 2017: [], 2023: [] @@ -160,12 +134,6 @@ 'suffix' : '_pixelTrackingOnly', 'offset' : 0.5, } -upgradeSteps['Timing'] = { - 'steps' : upgradeSteps['baseline']['steps'], - 'PU' : upgradeSteps['baseline']['PU'], - 'suffix' : '_Timing', - 'offset' : 0.11, -} upgradeSteps['ProdLike'] = { 'steps' : [ 'RecoFullGlobal', @@ -330,83 +298,6 @@ upgradeProperties[2017]['2021DesignPU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU'] upgradeProperties[2023] = { - '2023D17' : { - 'Geom' : 'Extended2023D17', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic', - 'Era' : 'Phase2', - 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], - }, - '2023D19' : { - 'Geom' : 'Extended2023D19', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic', - 'Era' : 'Phase2_timing_layer', - 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], - }, - '2023D21' : { - 'Geom' : 'Extended2023D21', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic', - 'Era' : 'Phase2', - 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], - }, - '2023D24' : { - 'Geom' : 'Extended2023D24', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic', - 'Era' : 'Phase2_timing_layer_tile', - 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], - }, - '2023D25' : { - 'Geom' : 'Extended2023D25', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic', - 'Era' : 'Phase2_timing_layer_bar', - 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], - }, - '2023D28' : { - 'Geom' : 'Extended2023D28', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic', - 'Era' : 'Phase2C4', - 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], - }, - '2023D29' : { - 'Geom' : 'Extended2023D29', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic', - 'Era' : 'Phase2', - 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], - }, - '2023D30' : { - 'Geom' : 'Extended2023D30', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic', - 'Era' : 'Phase2C4', - 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], - }, - '2023D31' : { - 'Geom' : 'Extended2023D31', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic', - 'Era' : 'Phase2C6', - 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], - }, - '2023D33' : { - 'Geom' : 'Extended2023D33', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic', - 'Era' : 'Phase2_timing_layer_bar', - 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], - }, - '2023D34' : { - 'Geom' : 'Extended2023D34', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic', - 'Era' : 'Phase2_timing_layer_bar', - 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], - }, '2023D35' : { 'Geom' : 'Extended2023D35', 'HLTmenu': '@fake2', @@ -414,90 +305,47 @@ 'Era' : 'Phase2C4_timing_layer_bar', 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], }, - '2023D38' : { - 'Geom' : 'Extended2023D38', + '2023D41' : { + 'Geom' : 'Extended2023D41', 'HLTmenu': '@fake2', 'GT' : 'auto:phase2_realistic', - 'Era' : 'Phase2C4_timing_layer_bar', + 'Era' : 'Phase2C8_timing_layer_bar', 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], }, - '2023D39' : { - 'Geom' : 'Extended2023D39', + '2023D43' : { + 'Geom' : 'Extended2023D43', 'HLTmenu': '@fake2', 'GT' : 'auto:phase2_realistic', 'Era' : 'Phase2C4_timing_layer_bar', 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], }, - '2023D40' : { - 'Geom' : 'Extended2023D40', + '2023D44' : { + 'Geom' : 'Extended2023D44', 'HLTmenu': '@fake2', 'GT' : 'auto:phase2_realistic', - 'Era' : 'Phase2', + 'Era' : 'Phase2C6_timing_layer_bar', 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], }, - '2023D41' : { - 'Geom' : 'Extended2023D41', + '2023D45' : { + 'Geom' : 'Extended2023D45', 'HLTmenu': '@fake2', 'GT' : 'auto:phase2_realistic', 'Era' : 'Phase2C8_timing_layer_bar', 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], }, - '2023D42' : { - 'Geom' : 'Extended2023D42', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic', - 'Era' : 'Phase2', - 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], - }, - '2023D43' : { - 'Geom' : 'Extended2023D43', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic', - 'Era' : 'Phase2C4_timing_layer_bar', - 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], - }, } +# standard PU sequences +for key in list(upgradeProperties[2023].keys()): + upgradeProperties[2023][key+'PU'] = deepcopy(upgradeProperties[2023][key]) + upgradeProperties[2023][key+'PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] - -#standard PU sequences -upgradeProperties[2023]['2023D17PU'] = deepcopy(upgradeProperties[2023]['2023D17']) -upgradeProperties[2023]['2023D17PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] -upgradeProperties[2023]['2023D19PU'] = deepcopy(upgradeProperties[2023]['2023D19']) -upgradeProperties[2023]['2023D19PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] -upgradeProperties[2023]['2023D21PU'] = deepcopy(upgradeProperties[2023]['2023D21']) -upgradeProperties[2023]['2023D21PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] -upgradeProperties[2023]['2023D24PU'] = deepcopy(upgradeProperties[2023]['2023D24']) -upgradeProperties[2023]['2023D24PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] -upgradeProperties[2023]['2023D25PU'] = deepcopy(upgradeProperties[2023]['2023D25']) -upgradeProperties[2023]['2023D25PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] -upgradeProperties[2023]['2023D28PU'] = deepcopy(upgradeProperties[2023]['2023D28']) -upgradeProperties[2023]['2023D28PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] -upgradeProperties[2023]['2023D29PU'] = deepcopy(upgradeProperties[2023]['2023D29']) -upgradeProperties[2023]['2023D29PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] -upgradeProperties[2023]['2023D30PU'] = deepcopy(upgradeProperties[2023]['2023D30']) -upgradeProperties[2023]['2023D30PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] -upgradeProperties[2023]['2023D31PU'] = deepcopy(upgradeProperties[2023]['2023D31']) -upgradeProperties[2023]['2023D31PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] -upgradeProperties[2023]['2023D33PU'] = deepcopy(upgradeProperties[2023]['2023D33']) -upgradeProperties[2023]['2023D33PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] -upgradeProperties[2023]['2023D34PU'] = deepcopy(upgradeProperties[2023]['2023D34']) -upgradeProperties[2023]['2023D34PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] -upgradeProperties[2023]['2023D35PU'] = deepcopy(upgradeProperties[2023]['2023D35']) -upgradeProperties[2023]['2023D35PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] -upgradeProperties[2023]['2023D38PU'] = deepcopy(upgradeProperties[2023]['2023D38']) -upgradeProperties[2023]['2023D38PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] -upgradeProperties[2023]['2023D39PU'] = deepcopy(upgradeProperties[2023]['2023D38']) -upgradeProperties[2023]['2023D39PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] -upgradeProperties[2023]['2023D40PU'] = deepcopy(upgradeProperties[2023]['2023D40']) -upgradeProperties[2023]['2023D40PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] -upgradeProperties[2023]['2023D41PU'] = deepcopy(upgradeProperties[2023]['2023D41']) -upgradeProperties[2023]['2023D41PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] -upgradeProperties[2023]['2023D42PU'] = deepcopy(upgradeProperties[2023]['2023D42']) -upgradeProperties[2023]['2023D42PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] -upgradeProperties[2023]['2023D43PU'] = deepcopy(upgradeProperties[2023]['2023D43']) -upgradeProperties[2023]['2023D43PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU'] - +# for relvals +defaultDataSets = {} +for year in upgradeKeys: + for key in upgradeKeys[year]: + if 'PU' in key: continue + defaultDataSets[key] = '' from Configuration.PyReleaseValidation.relval_steps import Kby diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index aad73d543cad3..ce857eb857531 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -75,10 +75,9 @@ def runSelected(opt): 10224.0, #2017 ttbar PU 10824.0, #2018 ttbar 11624.0, #2021 ttbar - 20034.0, #2023D17 ttbar (TDR baseline Muon/Barrel) - 21234.0, #2023D21 ttbar (Inner Tracker with lower radii than in TDR) - 27434.0, #2023D35 to exercise new HGCal + new MTD - 29034.0, #2023D41 (baseline for L1T TDR) + 20034.0, #2023D35 ttbar (MTD TDR baseline) + 20434.0, #2023D41 ttbar (L1T TDR baseline) + 21234.0, #2023D44 (exercise HF nose) 25202.0, #2016 ttbar UP15 PU 250202.181, #2018 ttbar stage1 + stage2 premix ], diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index c13ab308e3eff..6131362f95b18 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -39,9 +39,10 @@ def __init__(self): 'Phase2_timing_layer_bar', 'Phase2C4', 'Phase2C4_timing', + 'Phase2C4_timing_layer_bar', 'Phase2C6', 'Phase2C6_timing', - 'Phase2C4_timing_layer_bar', + 'Phase2C6_timing_layer_bar', 'Phase2C8', 'Phase2C8_timing', 'Phase2C8_timing_layer_bar', diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py index 0f35093064650..1b61dacb751b2 100644 --- a/Configuration/StandardSequences/python/GeometryConf.py +++ b/Configuration/StandardSequences/python/GeometryConf.py @@ -28,23 +28,9 @@ 'ECALHCAL' : 'Configuration.Geometry.GeometrySimECALHCAL_cff,Configuration.Geometry.GeometryRecoECALHCAL_cff', 'TrackerOnly' : 'Configuration.Geometry.GeometrySimTracker_cff,Configuration.Geometry.GeometryRecoTracker_cff', 'HCal' : 'Configuration.Geometry.GeometrySimHCAL_cff,Configuration.Geometry.GeometryRecoHCAL_cff', - 'Extended2023D17' : 'Extended2023D17,Extended2023D17Reco', - 'Extended2023D19' : 'Extended2023D19,Extended2023D19Reco', - 'Extended2023D21' : 'Extended2023D21,Extended2023D21Reco', - 'Extended2023D24' : 'Extended2023D24,Extended2023D24Reco', - 'Extended2023D25' : 'Extended2023D25,Extended2023D25Reco', - 'Extended2023D28' : 'Extended2023D28,Extended2023D28Reco', - 'Extended2023D29' : 'Extended2023D29,Extended2023D29Reco', - 'Extended2023D30' : 'Extended2023D30,Extended2023D30Reco', - 'Extended2023D31' : 'Extended2023D31,Extended2023D31Reco', - 'Extended2023D32' : 'Extended2023D32,Extended2023D32Reco', - 'Extended2023D33' : 'Extended2023D33,Extended2023D33Reco', - 'Extended2023D34' : 'Extended2023D34,Extended2023D34Reco', 'Extended2023D35' : 'Extended2023D35,Extended2023D35Reco', - 'Extended2023D38' : 'Extended2023D38,Extended2023D38Reco', - 'Extended2023D39' : 'Extended2023D39,Extended2023D39Reco', - 'Extended2023D40' : 'Extended2023D40,Extended2023D40Reco', 'Extended2023D41' : 'Extended2023D41,Extended2023D41Reco', - 'Extended2023D42' : 'Extended2023D42,Extended2023D42Reco', 'Extended2023D43' : 'Extended2023D43,Extended2023D43Reco', + 'Extended2023D44' : 'Extended2023D44,Extended2023D44Reco', + 'Extended2023D45' : 'Extended2023D45,Extended2023D45Reco', } diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D17XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D17XML_cfi.py deleted file mode 100644 index 8996c7cf593e9..0000000000000 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D17XML_cfi.py +++ /dev/null @@ -1,119 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring( - 'Geometry/CMSCommonData/data/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml', - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', - 'Geometry/CMSCommonData/data/cmsCalo.xml', - 'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml', - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml', - 'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml', - 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4025/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalendcap/SSAbsorber/hcalendcapalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/2023/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml', - 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', - 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', - 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', - 'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml', - 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', - 'Geometry/MuonCommonData/data/design/muonYoke.xml', - 'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml', - 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', - 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', - 'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml', - 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml', - 'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml', - 'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml', - 'Geometry/ForwardCommonData/data/brmrotations.xml', - 'Geometry/ForwardCommonData/data/PostLS2/brm.xml', - 'Geometry/ForwardCommonData/data/zdcmaterials.xml', - 'Geometry/ForwardCommonData/data/lumimaterials.xml', - 'Geometry/ForwardCommonData/data/zdcrotations.xml', - 'Geometry/ForwardCommonData/data/lumirotations.xml', - 'Geometry/ForwardCommonData/data/zdc.xml', - 'Geometry/ForwardCommonData/data/zdclumi.xml', - 'Geometry/ForwardCommonData/data/cmszdc.xml', - )+ - cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml', - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv8.xml', - 'Geometry/HGCalSimData/data/hgccons.xml', - 'Geometry/HGCalSimData/data/hgcProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml', - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml', - 'Geometry/ForwardCommonData/data/brmsens.xml', - 'Geometry/ForwardSimData/data/zdcsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', - 'Geometry/ForwardSimData/data/zdcProdCuts.xml', - 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml', - ), - rootNodeName = cms.string('cms:OCMS') -) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D19XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D19XML_cfi.py deleted file mode 100644 index 7ec7164780b6b..0000000000000 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D19XML_cfi.py +++ /dev/null @@ -1,124 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring( - 'Geometry/CMSCommonData/data/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml', - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', - 'Geometry/CMSCommonData/data/cmsCalo.xml', - 'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml', - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml', - 'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml', - 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4025/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalendcap/SSAbsorber/hcalendcapalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/2023/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml', - 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', - 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', - 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', - 'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml', - 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', - 'Geometry/MuonCommonData/data/design/muonYoke.xml', - 'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml', - 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', - 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', - 'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml', - 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml', - 'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml', - 'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml', - 'Geometry/ForwardCommonData/data/brmrotations.xml', - 'Geometry/ForwardCommonData/data/PostLS2/brm.xml', - 'Geometry/ForwardCommonData/data/zdcmaterials.xml', - 'Geometry/ForwardCommonData/data/lumimaterials.xml', - 'Geometry/ForwardCommonData/data/zdcrotations.xml', - 'Geometry/ForwardCommonData/data/lumirotations.xml', - 'Geometry/ForwardCommonData/data/zdc.xml', - 'Geometry/ForwardCommonData/data/zdclumi.xml', - 'Geometry/ForwardCommonData/data/cmszdc.xml', - 'Geometry/HGCalCommonData/data/fastTimingBarrel.xml', - 'Geometry/HGCalCommonData/data/fastTimingEndcap.xml', - 'Geometry/HGCalCommonData/data/fastTimingElement.xml', - )+ - cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml', - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv8.xml', - 'Geometry/HGCalSimData/data/hgccons.xml', - 'Geometry/HGCalSimData/data/hgcProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml', - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml', - 'Geometry/ForwardCommonData/data/brmsens.xml', - 'Geometry/ForwardSimData/data/zdcsens.xml', - 'Geometry/HGCalSimData/data/fasttimesens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', - 'Geometry/ForwardSimData/data/zdcProdCuts.xml', - 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', - 'Geometry/HGCalSimData/data/fasttimeProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml', - ), - rootNodeName = cms.string('cms:OCMS') -) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D21XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D21XML_cfi.py deleted file mode 100644 index a9d3cf7686415..0000000000000 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D21XML_cfi.py +++ /dev/null @@ -1,120 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring( - 'Geometry/CMSCommonData/data/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml', - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', - 'Geometry/CMSCommonData/data/cmsCalo.xml', - 'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml', - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml', - 'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml', - 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalendcap/SSAbsorber/hcalendcapalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/2023/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml', - 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', - 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', - 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', - 'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml', - 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', - 'Geometry/MuonCommonData/data/design/muonYoke.xml', - 'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml', - 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', - 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', - 'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml', - 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml', - 'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml', - 'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml', - 'Geometry/ForwardCommonData/data/brmrotations.xml', - 'Geometry/ForwardCommonData/data/PostLS2/brm.xml', - 'Geometry/ForwardCommonData/data/zdcmaterials.xml', - 'Geometry/ForwardCommonData/data/lumimaterials.xml', - 'Geometry/ForwardCommonData/data/zdcrotations.xml', - 'Geometry/ForwardCommonData/data/lumirotations.xml', - 'Geometry/ForwardCommonData/data/zdc.xml', - 'Geometry/ForwardCommonData/data/zdclumi.xml', - 'Geometry/ForwardCommonData/data/cmszdc.xml', - )+ - cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml', - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv8.xml', - 'Geometry/HGCalSimData/data/hgccons.xml', - 'Geometry/HGCalSimData/data/hgcProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml', - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml', - 'Geometry/ForwardCommonData/data/brmsens.xml', - 'Geometry/ForwardSimData/data/zdcsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', - 'Geometry/ForwardSimData/data/zdcProdCuts.xml', - 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml', - ), - rootNodeName = cms.string('cms:OCMS') -) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D24XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D24XML_cfi.py deleted file mode 100644 index 403f2fdaaf659..0000000000000 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D24XML_cfi.py +++ /dev/null @@ -1,127 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring( - 'Geometry/CMSCommonData/data/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml', - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', - 'Geometry/CMSCommonData/data/cmsCalo.xml', - 'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml', - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml', - 'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml', - 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalendcap/SSAbsorber/hcalendcapalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/2023/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml', - 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', - 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', - 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', - 'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml', - 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', - 'Geometry/MuonCommonData/data/design/muonYoke.xml', - 'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml', - 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', - 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', - 'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml', - 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml', - 'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml', - 'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml', - 'Geometry/ForwardCommonData/data/brmrotations.xml', - 'Geometry/ForwardCommonData/data/PostLS2/brm.xml', - 'Geometry/ForwardCommonData/data/zdcmaterials.xml', - 'Geometry/ForwardCommonData/data/lumimaterials.xml', - 'Geometry/ForwardCommonData/data/zdcrotations.xml', - 'Geometry/ForwardCommonData/data/lumirotations.xml', - 'Geometry/ForwardCommonData/data/zdc.xml', - 'Geometry/ForwardCommonData/data/zdclumi.xml', - 'Geometry/ForwardCommonData/data/cmszdc.xml', - 'Geometry/MTDCommonData/data/btl.xml', - 'Geometry/MTDCommonData/data/etl.xml', - 'Geometry/MTDCommonData/data/CrystalTile/mtd.xml', - 'Geometry/MTDCommonData/data/CrystalTile/mtdStructureTopology.xml', - 'Geometry/MTDCommonData/data/CrystalTile/mtdParameters.xml', - )+ - cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml', - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv8.xml', - 'Geometry/HGCalSimData/data/hgccons.xml', - 'Geometry/HGCalSimData/data/hgcProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml', - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml', - 'Geometry/ForwardCommonData/data/brmsens.xml', - 'Geometry/ForwardSimData/data/zdcsens.xml', - 'Geometry/MTDSimData/data/CrystalTile/mtdsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', - 'Geometry/ForwardSimData/data/zdcProdCuts.xml', - 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', - 'Geometry/MTDSimData/data/CrystalTile/mtdProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml', - ), - rootNodeName = cms.string('cms:OCMS') -) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D25XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D25XML_cfi.py deleted file mode 100644 index 9f5d27ce713d0..0000000000000 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D25XML_cfi.py +++ /dev/null @@ -1,127 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring( - 'Geometry/CMSCommonData/data/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml', - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', - 'Geometry/CMSCommonData/data/cmsCalo.xml', - 'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml', - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml', - 'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml', - 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalendcap/SSAbsorber/hcalendcapalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/2023/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml', - 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', - 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', - 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', - 'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml', - 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', - 'Geometry/MuonCommonData/data/design/muonYoke.xml', - 'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml', - 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', - 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', - 'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml', - 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml', - 'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml', - 'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml', - 'Geometry/ForwardCommonData/data/brmrotations.xml', - 'Geometry/ForwardCommonData/data/PostLS2/brm.xml', - 'Geometry/ForwardCommonData/data/zdcmaterials.xml', - 'Geometry/ForwardCommonData/data/lumimaterials.xml', - 'Geometry/ForwardCommonData/data/zdcrotations.xml', - 'Geometry/ForwardCommonData/data/lumirotations.xml', - 'Geometry/ForwardCommonData/data/zdc.xml', - 'Geometry/ForwardCommonData/data/zdclumi.xml', - 'Geometry/ForwardCommonData/data/cmszdc.xml', - 'Geometry/MTDCommonData/data/btl.xml', - 'Geometry/MTDCommonData/data/etl.xml', - 'Geometry/MTDCommonData/data/CrystalBar/mtd.xml', - 'Geometry/MTDCommonData/data/CrystalBar/mtdStructureTopology.xml', - 'Geometry/MTDCommonData/data/CrystalBar/mtdParameters.xml', - )+ - cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml', - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv8.xml', - 'Geometry/HGCalSimData/data/hgccons.xml', - 'Geometry/HGCalSimData/data/hgcProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml', - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml', - 'Geometry/ForwardCommonData/data/brmsens.xml', - 'Geometry/ForwardSimData/data/zdcsens.xml', - 'Geometry/MTDSimData/data/CrystalBar/mtdsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', - 'Geometry/ForwardSimData/data/zdcProdCuts.xml', - 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', - 'Geometry/MTDSimData/data/CrystalBar/mtdProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml', - ), - rootNodeName = cms.string('cms:OCMS') -) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D28XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D28XML_cfi.py deleted file mode 100644 index 9efaba8b6dac1..0000000000000 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D28XML_cfi.py +++ /dev/null @@ -1,121 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring( - 'Geometry/CMSCommonData/data/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml', - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', - 'Geometry/CMSCommonData/data/cmsCalo.xml', - 'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml', - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml', - 'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml', - 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/NoHE/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml', - 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', - 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', - 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', - 'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml', - 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', - 'Geometry/MuonCommonData/data/design/muonYoke.xml', - 'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml', - 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', - 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', - 'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml', - 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml', - 'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml', - 'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml', - 'Geometry/ForwardCommonData/data/brmrotations.xml', - 'Geometry/ForwardCommonData/data/PostLS2/brm.xml', - 'Geometry/ForwardCommonData/data/zdcmaterials.xml', - 'Geometry/ForwardCommonData/data/lumimaterials.xml', - 'Geometry/ForwardCommonData/data/zdcrotations.xml', - 'Geometry/ForwardCommonData/data/lumirotations.xml', - 'Geometry/ForwardCommonData/data/zdc.xml', - 'Geometry/ForwardCommonData/data/zdclumi.xml', - 'Geometry/ForwardCommonData/data/cmszdc.xml', - )+ - cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml', - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv9.xml', - 'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml', - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml', - 'Geometry/ForwardCommonData/data/brmsens.xml', - 'Geometry/ForwardSimData/data/zdcsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv9.xml', - 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', - 'Geometry/ForwardSimData/data/zdcProdCuts.xml', - 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml', - ), - rootNodeName = cms.string('cms:OCMS') -) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D29XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D29XML_cfi.py deleted file mode 100644 index 0bd0405d3de34..0000000000000 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D29XML_cfi.py +++ /dev/null @@ -1,120 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring( - 'Geometry/CMSCommonData/data/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml', - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', - 'Geometry/CMSCommonData/data/cmsCalo.xml', - 'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml', - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml', - 'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml', - 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker405/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalendcap/SSAbsorber/hcalendcapalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/2023/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml', - 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', - 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', - 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', - 'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml', - 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', - 'Geometry/MuonCommonData/data/design/muonYoke.xml', - 'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml', - 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', - 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', - 'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml', - 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml', - 'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml', - 'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml', - 'Geometry/ForwardCommonData/data/brmrotations.xml', - 'Geometry/ForwardCommonData/data/PostLS2/brm.xml', - 'Geometry/ForwardCommonData/data/zdcmaterials.xml', - 'Geometry/ForwardCommonData/data/lumimaterials.xml', - 'Geometry/ForwardCommonData/data/zdcrotations.xml', - 'Geometry/ForwardCommonData/data/lumirotations.xml', - 'Geometry/ForwardCommonData/data/zdc.xml', - 'Geometry/ForwardCommonData/data/zdclumi.xml', - 'Geometry/ForwardCommonData/data/cmszdc.xml', - )+ - cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml', - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv8.xml', - 'Geometry/HGCalSimData/data/hgccons.xml', - 'Geometry/HGCalSimData/data/hgcProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml', - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml', - 'Geometry/ForwardCommonData/data/brmsens.xml', - 'Geometry/ForwardSimData/data/zdcsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', - 'Geometry/ForwardSimData/data/zdcProdCuts.xml', - 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml', - ), - rootNodeName = cms.string('cms:OCMS') -) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D30XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D30XML_cfi.py deleted file mode 100644 index 23d42a299acea..0000000000000 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D30XML_cfi.py +++ /dev/null @@ -1,121 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring( - 'Geometry/CMSCommonData/data/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml', - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', - 'Geometry/CMSCommonData/data/cmsCalo.xml', - 'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml', - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml', - 'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml', - 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/NoHE/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v9p/hgcalCons.xml', - 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', - 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', - 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', - 'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml', - 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', - 'Geometry/MuonCommonData/data/design/muonYoke.xml', - 'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml', - 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', - 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', - 'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml', - 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml', - 'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml', - 'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml', - 'Geometry/ForwardCommonData/data/brmrotations.xml', - 'Geometry/ForwardCommonData/data/PostLS2/brm.xml', - 'Geometry/ForwardCommonData/data/zdcmaterials.xml', - 'Geometry/ForwardCommonData/data/lumimaterials.xml', - 'Geometry/ForwardCommonData/data/zdcrotations.xml', - 'Geometry/ForwardCommonData/data/lumirotations.xml', - 'Geometry/ForwardCommonData/data/zdc.xml', - 'Geometry/ForwardCommonData/data/zdclumi.xml', - 'Geometry/ForwardCommonData/data/cmszdc.xml', - )+ - cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml', - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv9.xml', - 'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml', - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml', - 'Geometry/ForwardCommonData/data/brmsens.xml', - 'Geometry/ForwardSimData/data/zdcsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv9.xml', - 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', - 'Geometry/ForwardSimData/data/zdcProdCuts.xml', - 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml', - ), - rootNodeName = cms.string('cms:OCMS') -) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D31XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D31XML_cfi.py deleted file mode 100644 index de315c27477dd..0000000000000 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D31XML_cfi.py +++ /dev/null @@ -1,127 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring( - 'Geometry/CMSCommonData/data/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml', - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', - 'Geometry/CMSCommonData/data/cmsCalo.xml', - 'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml', - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml', - 'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml', - 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/NoHE/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml', - 'Geometry/ForwardCommonData/data/hfnose/v1/hfnose.xml', - 'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml', - 'Geometry/ForwardCommonData/data/hfnoseCell/v1/hfnoseCell.xml', - 'Geometry/ForwardCommonData/data/hfnoseCons/v1/hfnoseCons.xml', - 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', - 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', - 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', - 'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml', - 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', - 'Geometry/MuonCommonData/data/design/muonYoke.xml', - 'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml', - 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', - 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', - 'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml', - 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml', - 'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml', - 'Geometry/ForwardCommonData/data/forwardshield/2023/v1/forwardshield.xml', - 'Geometry/ForwardCommonData/data/brmrotations.xml', - 'Geometry/ForwardCommonData/data/brm/2023/v2/brm.xml', - 'Geometry/ForwardCommonData/data/zdcmaterials.xml', - 'Geometry/ForwardCommonData/data/lumimaterials.xml', - 'Geometry/ForwardCommonData/data/zdcrotations.xml', - 'Geometry/ForwardCommonData/data/lumirotations.xml', - 'Geometry/ForwardCommonData/data/zdc.xml', - 'Geometry/ForwardCommonData/data/zdclumi.xml', - 'Geometry/ForwardCommonData/data/cmszdc.xml', - )+ - cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml', - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv9.xml', - 'Geometry/ForwardSimData/data/hfnosesens.xml', - 'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml', - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml', - 'Geometry/ForwardCommonData/data/brmsens.xml', - 'Geometry/ForwardSimData/data/zdcsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv9.xml', - 'Geometry/ForwardSimData/data/hfnoseProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', - 'Geometry/ForwardSimData/data/zdcProdCuts.xml', - 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml', - ), - rootNodeName = cms.string('cms:OCMS') -) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D32XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D32XML_cfi.py deleted file mode 100644 index fb022e36d1aaa..0000000000000 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D32XML_cfi.py +++ /dev/null @@ -1,121 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring( - 'Geometry/CMSCommonData/data/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml', - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', - 'Geometry/CMSCommonData/data/cmsCalo.xml', - 'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml', - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml', - 'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml', - 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/NoHE/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v9a/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v9a/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v9a/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v9a/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v9a/hgcalCons.xml', - 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', - 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', - 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', - 'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml', - 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', - 'Geometry/MuonCommonData/data/design/muonYoke.xml', - 'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml', - 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', - 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', - 'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml', - 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml', - 'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml', - 'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml', - 'Geometry/ForwardCommonData/data/brmrotations.xml', - 'Geometry/ForwardCommonData/data/PostLS2/brm.xml', - 'Geometry/ForwardCommonData/data/zdcmaterials.xml', - 'Geometry/ForwardCommonData/data/lumimaterials.xml', - 'Geometry/ForwardCommonData/data/zdcrotations.xml', - 'Geometry/ForwardCommonData/data/lumirotations.xml', - 'Geometry/ForwardCommonData/data/zdc.xml', - 'Geometry/ForwardCommonData/data/zdclumi.xml', - 'Geometry/ForwardCommonData/data/cmszdc.xml', - )+ - cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml', - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv9.xml', - 'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml', - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml', - 'Geometry/ForwardCommonData/data/brmsens.xml', - 'Geometry/ForwardSimData/data/zdcsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv9.xml', - 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', - 'Geometry/ForwardSimData/data/zdcProdCuts.xml', - 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml', - ), - rootNodeName = cms.string('cms:OCMS') -) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D33XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D33XML_cfi.py deleted file mode 100644 index ee919d75923c9..0000000000000 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D33XML_cfi.py +++ /dev/null @@ -1,127 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring( - 'Geometry/CMSCommonData/data/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml', - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', - 'Geometry/CMSCommonData/data/cmsCalo.xml', - 'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml', - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml', - 'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml', - 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalendcap/SSAbsorber/hcalendcapalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/2023/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml', - 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', - 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', - 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', - 'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml', - 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', - 'Geometry/MuonCommonData/data/design/muonYoke.xml', - 'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml', - 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', - 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', - 'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml', - 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml', - 'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml', - 'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml', - 'Geometry/ForwardCommonData/data/brmrotations.xml', - 'Geometry/ForwardCommonData/data/PostLS2/brm.xml', - 'Geometry/ForwardCommonData/data/zdcmaterials.xml', - 'Geometry/ForwardCommonData/data/lumimaterials.xml', - 'Geometry/ForwardCommonData/data/zdcrotations.xml', - 'Geometry/ForwardCommonData/data/lumirotations.xml', - 'Geometry/ForwardCommonData/data/zdc.xml', - 'Geometry/ForwardCommonData/data/zdclumi.xml', - 'Geometry/ForwardCommonData/data/cmszdc.xml', - 'Geometry/MTDCommonData/data/btl.xml', - 'Geometry/MTDCommonData/data/etl.xml', - 'Geometry/MTDCommonData/data/CrystalBarZflat/mtd.xml', - 'Geometry/MTDCommonData/data/CrystalBarZflat/mtdStructureTopology.xml', - 'Geometry/MTDCommonData/data/CrystalBarZflat/mtdParameters.xml', - )+ - cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml', - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv8.xml', - 'Geometry/HGCalSimData/data/hgccons.xml', - 'Geometry/HGCalSimData/data/hgcProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml', - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml', - 'Geometry/ForwardCommonData/data/brmsens.xml', - 'Geometry/ForwardSimData/data/zdcsens.xml', - 'Geometry/MTDSimData/data/CrystalBarZflat/mtdsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', - 'Geometry/ForwardSimData/data/zdcProdCuts.xml', - 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', - 'Geometry/MTDSimData/data/CrystalBarZflat/mtdProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml', - ), - rootNodeName = cms.string('cms:OCMS') -) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D34XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D34XML_cfi.py deleted file mode 100644 index bad80b38b7461..0000000000000 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D34XML_cfi.py +++ /dev/null @@ -1,127 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring( - 'Geometry/CMSCommonData/data/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml', - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', - 'Geometry/CMSCommonData/data/cmsCalo.xml', - 'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml', - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml', - 'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml', - 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalendcap/SSAbsorber/hcalendcapalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/2023/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml', - 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', - 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', - 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', - 'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml', - 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', - 'Geometry/MuonCommonData/data/design/muonYoke.xml', - 'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml', - 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', - 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', - 'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml', - 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml', - 'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml', - 'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml', - 'Geometry/ForwardCommonData/data/brmrotations.xml', - 'Geometry/ForwardCommonData/data/PostLS2/brm.xml', - 'Geometry/ForwardCommonData/data/zdcmaterials.xml', - 'Geometry/ForwardCommonData/data/lumimaterials.xml', - 'Geometry/ForwardCommonData/data/zdcrotations.xml', - 'Geometry/ForwardCommonData/data/lumirotations.xml', - 'Geometry/ForwardCommonData/data/zdc.xml', - 'Geometry/ForwardCommonData/data/zdclumi.xml', - 'Geometry/ForwardCommonData/data/cmszdc.xml', - 'Geometry/MTDCommonData/data/btl.xml', - 'Geometry/MTDCommonData/data/etl.xml', - 'Geometry/MTDCommonData/data/CrystalBarZflatNOhole/mtd.xml', - 'Geometry/MTDCommonData/data/CrystalBarZflatNOhole/mtdStructureTopology.xml', - 'Geometry/MTDCommonData/data/CrystalBarZflatNOhole/mtdParameters.xml', - )+ - cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml', - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv8.xml', - 'Geometry/HGCalSimData/data/hgccons.xml', - 'Geometry/HGCalSimData/data/hgcProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml', - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml', - 'Geometry/ForwardCommonData/data/brmsens.xml', - 'Geometry/ForwardSimData/data/zdcsens.xml', - 'Geometry/MTDSimData/data/CrystalBarZflat/mtdsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', - 'Geometry/ForwardSimData/data/zdcProdCuts.xml', - 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', - 'Geometry/MTDSimData/data/CrystalBarZflat/mtdProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml', - ), - rootNodeName = cms.string('cms:OCMS') -) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D40XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D40XML_cfi.py deleted file mode 100644 index b1b7121000253..0000000000000 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D40XML_cfi.py +++ /dev/null @@ -1,120 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring( - 'Geometry/CMSCommonData/data/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml', - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', - 'Geometry/CMSCommonData/data/cmsCalo.xml', - 'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml', - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml', - 'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml', - 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalendcap/SSAbsorber/hcalendcapalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/2023/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml', - 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', - 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', - 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', - 'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml', - 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', - 'Geometry/MuonCommonData/data/design/muonYoke.xml', - 'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml', - 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', - 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', - 'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml', - 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml', - 'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml', - 'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml', - 'Geometry/ForwardCommonData/data/brmrotations.xml', - 'Geometry/ForwardCommonData/data/PostLS2/brm.xml', - 'Geometry/ForwardCommonData/data/zdcmaterials.xml', - 'Geometry/ForwardCommonData/data/lumimaterials.xml', - 'Geometry/ForwardCommonData/data/zdcrotations.xml', - 'Geometry/ForwardCommonData/data/lumirotations.xml', - 'Geometry/ForwardCommonData/data/zdc.xml', - 'Geometry/ForwardCommonData/data/zdclumi.xml', - 'Geometry/ForwardCommonData/data/cmszdc.xml', - )+ - cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml', - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv8.xml', - 'Geometry/HGCalSimData/data/hgccons.xml', - 'Geometry/HGCalSimData/data/hgcProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml', - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml', - 'Geometry/ForwardCommonData/data/brmsens.xml', - 'Geometry/ForwardSimData/data/zdcsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', - 'Geometry/ForwardSimData/data/zdcProdCuts.xml', - 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml', - ), - rootNodeName = cms.string('cms:OCMS') -) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D42XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D42XML_cfi.py deleted file mode 100644 index a5e0756c64210..0000000000000 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D42XML_cfi.py +++ /dev/null @@ -1,120 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2023Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring( - 'Geometry/CMSCommonData/data/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml', - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', - 'Geometry/CMSCommonData/data/cmsCalo.xml', - 'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml', - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml', - 'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml', - 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalendcap/SSAbsorber/hcalendcapalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/2023/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml', - 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', - 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', - 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', - 'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml', - 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', - 'Geometry/MuonCommonData/data/design/muonYoke.xml', - 'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml', - 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', - 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', - 'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml', - 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', - 'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml', - 'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml', - 'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml', - 'Geometry/ForwardCommonData/data/brmrotations.xml', - 'Geometry/ForwardCommonData/data/PostLS2/brm.xml', - 'Geometry/ForwardCommonData/data/zdcmaterials.xml', - 'Geometry/ForwardCommonData/data/lumimaterials.xml', - 'Geometry/ForwardCommonData/data/zdcrotations.xml', - 'Geometry/ForwardCommonData/data/lumirotations.xml', - 'Geometry/ForwardCommonData/data/zdc.xml', - 'Geometry/ForwardCommonData/data/zdclumi.xml', - 'Geometry/ForwardCommonData/data/cmszdc.xml', - )+ - cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml', - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv8.xml', - 'Geometry/HGCalSimData/data/hgccons.xml', - 'Geometry/HGCalSimData/data/hgcProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml', - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml', - 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml', - 'Geometry/ForwardCommonData/data/brmsens.xml', - 'Geometry/ForwardSimData/data/zdcsens.xml', - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', - 'Geometry/ForwardSimData/data/zdcProdCuts.xml', - 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml', - ), - rootNodeName = cms.string('cms:OCMS') -) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D38XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D44XML_cfi.py similarity index 89% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2023D38XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometry2023D44XML_cfi.py index fb7c01ac1f796..0cf050c90e86e 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D38XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D44XML_cfi.py @@ -26,19 +26,19 @@ 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml', + 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixfwd.xml', 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', 'Geometry/TrackerCommonData/data/trackermaterial.xml', 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml', + 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/tracker.xml', + 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixel.xml', 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml', + 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml', 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml', 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml', + 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613/trackerRecoMaterial.xml', 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml', 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml', 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', @@ -66,6 +66,10 @@ 'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml', 'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml', 'Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml', + 'Geometry/ForwardCommonData/data/hfnose/v1/hfnose.xml', + 'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml', + 'Geometry/ForwardCommonData/data/hfnoseCell/v1/hfnoseCell.xml', + 'Geometry/ForwardCommonData/data/hfnoseCons/v1/hfnoseCons.xml', 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', @@ -105,11 +109,12 @@ 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil.xml', 'Geometry/HGCalSimData/data/hgcsensv9.xml', + 'Geometry/ForwardSimData/data/hfnosesens.xml', 'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml', 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', + 'Geometry/RPCGeometryBuilder/data/2023/v1/RPCSpecs.xml', 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml', 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml', 'Geometry/ForwardCommonData/data/brmsens.xml', @@ -118,6 +123,7 @@ 'Geometry/HcalSimData/data/HcalProdCuts.xml', 'Geometry/EcalSimData/data/EcalProdCuts.xml', 'Geometry/HGCalSimData/data/hgcProdCutsv9.xml', + 'Geometry/ForwardSimData/data/hfnoseProdCuts.xml', 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', 'Geometry/ForwardSimData/data/zdcProdCuts.xml', 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D39XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D45XML_cfi.py similarity index 78% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2023D39XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometry2023D45XML_cfi.py index 30055f2cef8a4..1ddcd128b6ce9 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D39XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D45XML_cfi.py @@ -8,11 +8,11 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2023/v2/cms.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', - 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', + 'Geometry/CMSCommonData/data/caloBase/2023/v2/caloBase.xml', 'Geometry/CMSCommonData/data/cmsCalo.xml', 'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml', 'Geometry/CMSCommonData/data/cmsMuon.xml', @@ -26,46 +26,45 @@ 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', + 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml', + 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml', 'Geometry/TrackerCommonData/data/trackermaterial.xml', 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml', + 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml', + 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixel.xml', 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml', + 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml', 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml', 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml', + 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml', 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml', 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml', 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/EcalCommonData/data/ectkcable.xml', - 'Geometry/EcalCommonData/data/eregalgo/2023/v1/eregalgo.xml', + 'Geometry/EcalCommonData/data/eregalgo/2023/v2/eregalgo.xml', + 'Geometry/EcalCommonData/data/ectkcable/2023/v1/ectkcable.xml', + 'Geometry/EcalCommonData/data/ectkcablemat/2023/v1/ectkcablemat.xml', 'Geometry/EcalCommonData/data/ebalgo.xml', 'Geometry/EcalCommonData/data/ebcon.xml', 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/EcalCommonData/data/eecon.xml', - 'Geometry/EcalCommonData/data/escon/2023/v1/escon.xml', - 'Geometry/EcalCommonData/data/esalgo/2023/v1/esalgo.xml', 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/NoHE/hcalalgo.xml', + 'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml', 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', + 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml', 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml', + 'Geometry/HGCalCommonData/data/hgcal/v10/hgcal.xml', + 'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml', + 'Geometry/HGCalCommonData/data/hgcalHEsil/v10/hgcalHEsil.xml', + 'Geometry/HGCalCommonData/data/hgcalHEmix/v10/hgcalHEmix.xml', 'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml', 'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml', + 'Geometry/HGCalCommonData/data/hgcalCons/v10/hgcalCons.xml', 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', @@ -91,10 +90,10 @@ 'Geometry/ForwardCommonData/data/zdclumi.xml', 'Geometry/ForwardCommonData/data/cmszdc.xml', 'Geometry/MTDCommonData/data/btl.xml', - 'Geometry/MTDCommonData/data/etl.xml', - 'Geometry/MTDCommonData/data/CrystalBarPhiFlatOldTh/mtd.xml', - 'Geometry/MTDCommonData/data/CrystalBarPhiFlatOldTh/mtdStructureTopology.xml', - 'Geometry/MTDCommonData/data/CrystalBarPhiFlatOldTh/mtdParameters.xml', + 'Geometry/MTDCommonData/data/etl/v2/etl.xml', + 'Geometry/MTDCommonData/data/CrystalBarPhiFlat/v3/mtd.xml', + 'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml', + 'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml', )+ cms.vstring( 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml', @@ -109,7 +108,7 @@ 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', + 'Geometry/RPCGeometryBuilder/data/2023/v1/RPCSpecs.xml', 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml', 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml', 'Geometry/ForwardCommonData/data/brmsens.xml',