diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md index a67bae3cd2c78..21737f801ea4b 100644 --- a/Configuration/Geometry/README.md +++ b/Configuration/Geometry/README.md @@ -100,119 +100,51 @@ The Phase 2 geometries are automatically created using the script [generateRun4G Different versions of various subdetectors can be combined. The available versions are: Tracker: -* 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.) -* T21: Phase2 tilted tracker. Outer Tracker (v8.0.0): TBPS update in Layer 1 (facilitate IT insertion) + In all TEDD, update sensors Z inter-spacing. Inner Tracker: (v6.1.5) from previous T17 -(TFPX: Changed sensors spacing within all double-disks + Increased distance between Disks 6 and 7 + TBPX portcards between Disks 6 and 7.) -* T24: Phase2 tilted tracker. Tracker detector description itself is identical to T21 (OT800 IT615). Change of paradigm, entire description reworked to be compatible with DD4hep library. -* T25: Phase2 tilted tracker. Outer Tracker (v8.0.0): same as T24/T21. Inner Tracker (v7.0.2): Based on (v6.1.5) (T24/T21), but with 3D sensors in TBPX L1. Compatible with DD4hep library. -* T26: Phase2 tilted tracker. Outer Tracker (v8.0.0): same as T24/T21. Inner Tracker (v7.0.3): Based on (v6.1.5) (T24/T21), but with 3D sensors in TBPX L1 and 50x50 pixel aspect ratio in TFPX and TEPX. Compatible with DD4hep library. -* T30: Phase2 tilted tracker. Exploratory geometry *only to be used in D91 for now*. Outer Tracker (v8.0.1): based on v8.0.0 with updated TB2S spacing. Inner Tracker (v6.4.0): based on v6.1.5 but TFPX with more realistic module positions. -* T31: Phase2 tilted tracker. The tracker description is identical to T24/T21. The outer radius of the tracker volume is reduced to avoid a clash with the BTL geometry. The positions of the tracker components are not affected -* T32: Phase2 tilted tracker. The tracker description is identical to T25. The outer radius of the tracker volume is reduced to avoid a clash with the BTL geometry (same as T31). The positions of the tracker components are not affected. This geometry is intended as a transition step towards a realistic configuration with 3D sensors in TBPX layer1. -* T33: Phase2 tilted tracker. Identical to T32 apart from a more realistic description of the 3D sensors in TBPX layer1. -* T34: Same as T32 with the exception of modified Tracker volume so that it touches CALO on the outer side and BeamPipe on the inner side -* T35: Same as T33 with the exception of modified Tracker volume so that it touches CALO on the outer side and BeamPipe on the inner side +* T35: Phase2 tilted tracker. Outer Tracker (v8.0.0), Inner Tracker (v7.0.2): Based on (v6.1.5), but with (more realistic) 3D sensors in TBPX L1. The outer radius of the tracker volume is reduced to avoid a clash with the BTL geometry. Modified Tracker volume so that it touches CALO on the outer side and BeamPipe on the inner side * T36: OT (v8.0.6): increased (smallDelta +300 micron) inter-ladder radial spacing TB2S. IT (v7.4.1): TBPX as in T35 with 0.4 mm gap between Z+ and Z- * T37: OT (v8.0.6): increased (smallDelta +300 micron) inter-ladder radial spacing TB2S. IT (v7.4.2): TBPX as in T35 with 0.7+0.4+0.7 mm gap between Z+ and Z- * T38: OT (v8.0.6): increased (smallDelta +300 micron) inter-ladder radial spacing TB2S. IT (v7.4.4): TBPX as in T35 with 1.3+0.4+1.3 mm gap between Z+ and Z- * T39: Same as T35 but introducing BigPixels in InnerTracker (1x2 planar and 2x2 planar modules) Calorimeters: -* C9: HGCal (v11 post TDR HGCal Geometry w/ corner centering for HE part) + Phase2 HCAL and EB + Tracker cables (used in Run4D49) -* C10: HGCal (as in C9) + HFNose with corrected wafer size + Phase2 HCAL and EB (used in Run4D60) -* C11: HGCal (v12 post TDR HGCal Geometry same as C9 + modified support structure + full list of masked wafers) + Phase2 HCAL and EB + Tracker cables (used in Run4D68) -* C13: HGCal (v13 version which reads the input from the flat file, uses these for checks and makes provision to be used downstream) + Phase2 HCAL and EB (used in Run4D70, Run4D84) -* C14: HGCal (v14 version reading the input from the flat file and uses it to create geometry, still using masking to define partial wafers) + Phase2 HCAL and EB (used in Run4D76-81, Run4D85, Run4D87) -* C15: HGCal (as in C14) + HFNose with corrected wafer size + Phase2 HCAL and EB (used in Run4D82) -* C16: HGCal (v15 version of HGCal geometry created using real full and partial silicon modules using the constants of the flat file) + Phase2 HCAL and EB (used in Run4D83) -* C17: HGCal (v16 version of HGCal geometry created with new longitudinal structure having 47 layers and new definition of partial wafers iusing the constants of the flat file) + Phase2 HCAL and EB (used in Run4D86, Run4D88) -* C18: HGCal (v17 version of HGCal geometry created for a new flat file for silicon having 47 layers, ideas of cassettes, new orientation indices for full and partial wafers) + Phase2 HCAL and EB (used in Run4D92) -* C19: HGCal (v17 version of HGCal geometry as in C18 but without internal cells in the Geant4 geometry definition) + Phase2 HCAL and EB (used in Run4D93) -* C20: HGCal (v17 version of HGCal geometry as in C18) + HFNose with corrected wafer size + Phase2 HCAL and EB (used in Run4D93) -* C21: HGCal (v17 version of HGCal geometry as in C19 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in Run4D101) -* C22: HGCal (v18 version of HGCal geometry as in C18 with calibration cells, nonzero cssette retraction, correct mousebite, guard ring, proper cell size) + Phase2 HCAL and EB (used in Run4D104) -* C23: HGCal (same as the v18 version which is in C22 but without internal cells in the Geant4 geometry defintiion) + Phase2 HCAL and EB (used in Run4D106) -* C24: HGCal (v18 version of HGCal geometry as in C22 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in Run4D109) -* C25: sane as C18 but changing ebalgo.xml to make it more conformant with standard -* C26: HGCal (v19 version of HGCal geometry with calibration cells, nonzero cssette retraction, correct mousebite, guard ring, proper cell size) + Phase2 HCAL and EB (used in Run4D120) -* C27: HGCal (same as the v19 version which is in C26 but without internal cells in the Geant4 geometry defintiion) + Phase2 HCAL and EB (used in Run4D106) -* C28: HGCal (v19 version of HGCal geometry as in C22 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in Run4D109) +* C18: HGCal (v17 version of HGCal geometry created for a new flat file for silicon having 47 layers, ideas of cassettes, new orientation indices for full and partial wafers) + Phase2 HCAL and EB +* C19: HGCal (v17 version of HGCal geometry as in C18 but without internal cells in the Geant4 geometry definition) + Phase2 HCAL and EB +* C20: HGCal (v17 version of HGCal geometry as in C18) + HFNose with corrected wafer size + Phase2 HCAL and EB +* C22: HGCal (v18 version of HGCal geometry with calibration cells, nonzero cassette retraction, correct mousebite, guard ring, proper cell size) + Phase2 HCAL and EB +* C25: same as C18 but changing ebalgo.xml to make it more conformant with standard and removing overlaps +* C26: HGCal (v19 version of HGCal geometry with calibration cells, nonzero cassette retraction, correct mousebite, guard ring, proper cell size) + Phase2 HCAL and EB +* C27: HGCal (same as the v19 version which is in C26 but without internal cells in the Geant4 geometry definition) + Phase2 HCAL and EB +* C28: HGCal (v19 version of HGCal geometry as in C22 but turning off all dead areas and gaps) + Phase2 HCAL and EB Muon system: -* M4: Phase2 muon system for TDR w/ GE2/1, ME0, RE3/1, RE4/1 (incl. granularity in ME0, staggered GE2/1), 96 iRPC strips, no overlaps, MB4Shields -* M6: same as M4 with right value for YE3 size, no "hidden" overlaps, iRPC updated, adjustment of ME0 in view of updated boundaries -* M7: same as M6 with further ajustment of ME0 for boundaries -* M8: same as M7 with changed number of strips for GE21 -* M9: same as M8 with GE0 replacing ME0 -* M10: same as M9 but with a realistic support structure for GE0, Shield structure modified in muonYoke -* M11: same as M10 but with a corrected eta partition sizes for GE21 -* M12: same as M11 but removing overlaps in yoke, MB3, GE0 + adding DT shield -* M13: same as M10 with right front-back relation between alternate phi segments -* M14: same as M11 with right front-back relation between alternate phi segments -* M15: same as M12 with right front-back relation between alternate phi segments +* M14: Phase2 muon system for TDR w/ GE2/1, GE0, RE3/1, RE4/1 (incl. granularity in ME0, staggered GE2/1), 96 iRPC strips; no overlaps, MB4Shields with right value for YE3 size and Shield structure modified in muonYoke, changed number of strips and corrected eta partition size for GE21, a realistic support structure for GE0 and adjustment for boundaries, right front-back relation between alternate phi segments +* M15: same as M14 but removing overlaps in yoke, MB3, GE0 + adding DT shield * M16: same as M15 with reverting RPC endcap disk4 rotation Fast Timing system: -* I10: Fast Timing detector (LYSO barrel (bars along phi flat), silicon endcap), w/ passive materials, ETL in position defined in O4, material adjustments -* I11: Same as I10, xml reorganized, comparison base for new ETL and DD4hep migration -* I12: Starting from I11, new ETL layout from MTD TDR -* I13: Starting from I11, new ETL layout from post MTD TDR (2 sectors per disc face) -* I14: Same as I13, updated sensor structure, disc z location and passive materials -* I15: Same as I14, addition of notch and revision of envelope -* I16: Starting from I15, revised BTL with complete passive material description, it needs Tracker T31 or newer -* I17: Same as I16, BTL with one crystal thickness (type) only, ETL with LGAD split into two sensors +* I17: Fast Timing detector (LYSO barrel (bars along phi flat), silicon endcap), w/ passive materials, material adjustments, new ETL layout from post MTD TDR (2 sectors per disc face), updated sensor structure, disc z location and passive materials, addition of notch and revision of envelope, revised BTL with complete passive material description, BTL with one crystal thickness (type) only, ETL with LGAD split into two sensors * I18: Same as I17, needed for updated BTL numbering scheme and BTLDetId format -* I19: BTL I18/v4, ETL v9 with 2024 full layout * I20: BTL I18/v4, ETL v10 with 2024 1.7 layout * I21: BTL I18/v4, ETL v11 with 2024 full layout, same as v9 with additional level and id for service hybrids * I22: BTL I18/v4, ETL v12 with 2024 1.7 layout, same as v10 with additional level and id for service hybrids The script also handles the common and forward elements of the geometry: -* O4: detailed cavern description, changes for modified CALO region for endcap part, no overlaps inside the Muon System -* O5: same as O4 but with changes needed for new support structure -* O6: same as O5 with changes needed for new defintion of boundaries -* O7: same as O6 with changes needed for new defintion of calorimeter boundaries -* O8: same as O7 with changes needed for a newer definition of calorimeter boundaries -* O9: same as O8 with changes needed to support the additional notch in ETL +* O9: detailed cavern description, changes for modified CALO region for endcap part, no overlaps inside the Muon System, new support structure, newer definition of calorimeter boundaries, support the additional notch in ETL * O10: same as O9 with changes needed to support the shields for DT -* F2: modifications needed to accommodate detailed cavern, ZDC description is removed. -* F3: same as F2 but changes due to HFNose -* F4: same as F2 but with modifications needed to forward shield -* F5: same as F4 but changes due to HFNose -* F6: same as F4 with modifications needed for BRM and forward shield -* F7: same as F6 with modifications needed for HFNose -* F8: same as F6 or F7 without BRM +* F8: modifications needed to accommodate detailed cavern, forward shield, HFNose; ZDC description is removed. * F9: same as F8 after removing overlap in rotated shield Several detector combinations have been generated: -* D95 = T31+C17+M13+I16+O9+F8 -* D96 = T31+C18+M13+I16+O9+F8 -* D98 = T32+C17+M13+I16+O9+F8 -* D99 = T32+C18+M13+I16+O9+F8 -* D100 = T34+C17+M14+I16+O9+F8 -* D101 = T34+C18+M14+I16+O9+F8 -* D102 = T35+C17+M14+I16+O9+F8 -* D103 = T35+C21+M14+I17+O9+F8 * D104 = T35+C22+M14+I16+O9+F8 -* D105 = T35+C17+M14+I17+O9+F8 -* D106 = T35+C23+M14+I17+O9+F8 -* D107 = T32+C17+M14+I17+O9+F8 -* D108 = T35+C19+M14+I17+O9+F8 -* D109 = T35+C24+M14+I17+O9+F8 * D110 = T35+C18+M14+I17+O9+F8 * D111 = T36+C24+M14+I17+O9+F8 * D112 = T37+C24+M14+I17+O9+F8 * D113 = T38+C24+M14+I17+O9+F8 * D114 = T39+C19+M14+I17+O9+F8 -* D115 = T35+C20+M14+I17+O9+F8 -* D116 = T35+C25+M15+I17+O10+F9 -* D117 = T35+C25+M15+I18+O10+F9 -* D118 = T35+C25+M15+I19+O10+F9 -* D119 = T35+C25+M15+I20+O10+F9 * D120 = T35+C26+M16+I20+O10+F9 * D121 = T35+C25+M16+I18+O10+F9 (Current Phase-2 baseline from CMSSW_15_1_0_pre4) -* D122 = T35+C27+M16+I18+O10+F9 -* D123 = T35+C28+M16+I18+O10+F9 +* D122 = T35+C27+M16+I18+O10+F9 +* D123 = T35+C28+M16+I18+O10+F9 * D124 = T35+C25+M16+I21+O10+F9 * D125 = T35+C25+M16+I22+O10+F9 diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D100Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D100Reco_cff.py deleted file mode 100644 index e02c760b756f5..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D100Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtendedRun4D100_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D100_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D100_cff.py deleted file mode 100644 index 50c146d6df848..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D100_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D100.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D101Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D101Reco_cff.py deleted file mode 100644 index 88c677f682c02..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D101Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtendedRun4D101_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D101_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D101_cff.py deleted file mode 100644 index 8ae15a505e189..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D101_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D101.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D102Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D102Reco_cff.py deleted file mode 100644 index bdf887392e578..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D102Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtendedRun4D102_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D102_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D102_cff.py deleted file mode 100644 index 37fe4ec87d28f..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D102_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D102.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D103Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D103Reco_cff.py deleted file mode 100644 index 871d6b56f6982..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D103Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtendedRun4D103_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D103_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D103_cff.py deleted file mode 100644 index 97891c39d5f79..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D103_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D103.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D105Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D105Reco_cff.py deleted file mode 100644 index 942f3caeb199b..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D105Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtendedRun4D105_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D105_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D105_cff.py deleted file mode 100644 index 7bcf9eb2ca947..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D105_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D105.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D106Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D106Reco_cff.py deleted file mode 100644 index b6a34eafb8186..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D106Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtendedRun4D106_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D106_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D106_cff.py deleted file mode 100644 index 434309f67f15d..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D106_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D106.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D107Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D107Reco_cff.py deleted file mode 100644 index 7ecd8ccb54948..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D107Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtendedRun4D107_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D107_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D107_cff.py deleted file mode 100644 index 5fa6849887d6e..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D107_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D107.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D108Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D108Reco_cff.py deleted file mode 100644 index 34dabf5a5fbe7..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D108Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtendedRun4D108_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D108_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D108_cff.py deleted file mode 100644 index 26b48fccbf0db..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D108_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D108.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D109Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D109Reco_cff.py deleted file mode 100644 index ea708db64748a..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D109Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtendedRun4D109_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D109_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D109_cff.py deleted file mode 100644 index b2e3658e2d81a..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D109_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D109.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D116Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D116Reco_cff.py deleted file mode 100644 index 422575b532001..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D116Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtendedRun4D116_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D116_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D116_cff.py deleted file mode 100644 index c49cf2870330f..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D116_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D116.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D117Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D117Reco_cff.py deleted file mode 100644 index 03cfbc29fbfde..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D117Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtendedRun4D117_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D117_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D117_cff.py deleted file mode 100644 index 5f534cbff423f..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D117_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D117.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D118Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D118Reco_cff.py deleted file mode 100644 index 1ccedfefdea60..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D118Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtendedRun4D118_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D118_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D118_cff.py deleted file mode 100644 index 301569f432e1c..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D118_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D118.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D119Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D119Reco_cff.py deleted file mode 100644 index ebab95e320019..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D119Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtendedRun4D119_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D119_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D119_cff.py deleted file mode 100644 index 598ce7bcf81b2..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D119_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D119.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D95Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D95Reco_cff.py deleted file mode 100644 index 41e14722c4231..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D95Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtendedRun4D95_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D95_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D95_cff.py deleted file mode 100644 index a2c6b51e80437..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D95_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D95.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D96Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D96Reco_cff.py deleted file mode 100644 index 6990a7f6bc4ea..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D96Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtendedRun4D96_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D96_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D96_cff.py deleted file mode 100644 index 3d65563a85699..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D96_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D96.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D98Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D98Reco_cff.py deleted file mode 100644 index 9497809f0d82c..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D98Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtendedRun4D98_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D98_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D98_cff.py deleted file mode 100644 index 20172f67bc6ed..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D98_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D99Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D99Reco_cff.py deleted file mode 100644 index 80a0dc852bc05..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D99Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtendedRun4D99_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D99_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D99_cff.py deleted file mode 100644 index c4c1e4ddd49d8..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D99_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D99.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D100Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D100Reco_cff.py deleted file mode 100644 index cb068f1ee30dc..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D100Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtendedRun4D100_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D100_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D100_cff.py deleted file mode 100644 index e3b496b2a000a..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D100_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometryRun4D100XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D101Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D101Reco_cff.py deleted file mode 100644 index 6b678cd7688d6..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D101Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtendedRun4D101_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D101_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D101_cff.py deleted file mode 100644 index bed56377fecc6..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D101_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometryRun4D101XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D102Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D102Reco_cff.py deleted file mode 100644 index cf36420bb9b57..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D102Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtendedRun4D102_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D102_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D102_cff.py deleted file mode 100644 index 8a948c37adcea..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D102_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometryRun4D102XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D103Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D103Reco_cff.py deleted file mode 100644 index 72f2ee09ce10e..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D103Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtendedRun4D103_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D103_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D103_cff.py deleted file mode 100644 index 4ef7e675d2d51..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D103_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometryRun4D103XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D105Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D105Reco_cff.py deleted file mode 100644 index f9814798dd07b..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D105Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtendedRun4D105_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D105_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D105_cff.py deleted file mode 100644 index 2b84287037dbe..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D105_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometryRun4D105XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D106Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D106Reco_cff.py deleted file mode 100644 index 3c767ff22ed76..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D106Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtendedRun4D106_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D106_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D106_cff.py deleted file mode 100644 index fb69caad47837..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D106_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometryRun4D106XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D107Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D107Reco_cff.py deleted file mode 100644 index 2d64c4dd8946f..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D107Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtendedRun4D107_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D107_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D107_cff.py deleted file mode 100644 index 8e04bacadda1a..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D107_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometryRun4D107XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D108Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D108Reco_cff.py deleted file mode 100644 index eeaf92b111321..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D108Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtendedRun4D108_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D108_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D108_cff.py deleted file mode 100644 index a4ac3ef17b2e8..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D108_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometryRun4D108XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D109Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D109Reco_cff.py deleted file mode 100644 index 80a4ccd2a3b61..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D109Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtendedRun4D109_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D109_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D109_cff.py deleted file mode 100644 index e373d1ef42d22..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D109_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometryRun4D109XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D116Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D116Reco_cff.py deleted file mode 100644 index 48d3b4754c934..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D116Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtendedRun4D116_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D116_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D116_cff.py deleted file mode 100644 index ccf526aad9c86..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D116_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometryRun4D116XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D117Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D117Reco_cff.py deleted file mode 100644 index 6bf2c3fb28ad4..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D117Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtendedRun4D117_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D117_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D117_cff.py deleted file mode 100644 index 75c6094f37de8..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D117_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometryRun4D117XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D118Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D118Reco_cff.py deleted file mode 100644 index 08ea89cf9f550..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D118Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtendedRun4D118_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D118_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D118_cff.py deleted file mode 100644 index 61f6ca4e5d19e..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D118_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometryRun4D118XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D119Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D119Reco_cff.py deleted file mode 100644 index 5a7872b51e250..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D119Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtendedRun4D119_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D119_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D119_cff.py deleted file mode 100644 index 69ecd4653e902..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D119_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometryRun4D119XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D95Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D95Reco_cff.py deleted file mode 100644 index 9c838b7ed539c..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D95Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtendedRun4D95_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D95_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D95_cff.py deleted file mode 100644 index e592e7e0e169a..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D95_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometryRun4D95XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D96Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D96Reco_cff.py deleted file mode 100644 index ad0d3baa1595b..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D96Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtendedRun4D96_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D96_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D96_cff.py deleted file mode 100644 index d508c2645f0a3..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D96_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometryRun4D96XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D98Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D98Reco_cff.py deleted file mode 100644 index d5d195d567cc1..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D98Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtendedRun4D98_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D98_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D98_cff.py deleted file mode 100644 index 471db00b127a6..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D98_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometryRun4D98XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D99Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D99Reco_cff.py deleted file mode 100644 index 69d21f290cad7..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D99Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtendedRun4D99_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_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_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D99_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D99_cff.py deleted file mode 100644 index a92355b7ca6da..0000000000000 --- a/Configuration/Geometry/python/GeometryExtendedRun4D99_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generateRun4Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometryRun4D99XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/dictRun4Geometry.py b/Configuration/Geometry/python/dictRun4Geometry.py index 27f5c97b8d795..72e08dcfd64b5 100644 --- a/Configuration/Geometry/python/dictRun4Geometry.py +++ b/Configuration/Geometry/python/dictRun4Geometry.py @@ -4,33 +4,6 @@ "abbrev" : "O", "name" : "common", "default" : 10, - "O8" : { - 1 : [ - 'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml', - 'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml', - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', - 'Geometry/CMSCommonData/data/cmsTracker.xml', - 'Geometry/CMSCommonData/data/caloBase/2030/v6/caloBase.xml', - 'Geometry/CMSCommonData/data/cmsCalo.xml', - 'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml', - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml', - 'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml', - 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', - ], - 5 : [ - 'Geometry/CMSCommonData/data/FieldParameters.xml', - ], - "era" : "phase2_common, phase2_trigger", - }, "O9" : { 1 : [ 'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml', @@ -119,263 +92,7 @@ trackerDict = { "abbrev" : "T", "name" : "tracker", - "default" : 34, - "T24" : { - 1 : [ - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerRecoMaterial.xml', - 'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseII/v1/trackingMaterialGroups_ForPhaseII.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - ], - "sim" : [ - 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *', - 'from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *', - ], - "reco" : [ - 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', - 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', - 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', - 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', - 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', - 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', - 'trackerGeometry.applyAlignment = True', - ], - "era" : "phase2_tracker, trackingPhase2PU140", - }, - "T25" : { - 1 : [ - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - ], - "sim" : [ - 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *', - 'from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *', - ], - "reco" : [ - 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', - 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', - 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', - 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', - 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', - 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', - 'trackerGeometry.applyAlignment = True', - ], - "era" : "phase2_tracker, phase2_3DPixels, trackingPhase2PU140", - }, - "T30" : { - 1 : [ - 'Geometry/TrackerCommonData/data/PhaseII/TFPXTEPXReordered/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_OT801_IT640/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_OT801_IT640/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_OT801_IT640/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_OT801_IT640/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_OT801_IT640/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_OT801_IT640/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - ], - "sim" : [ - 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *', - 'from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *', - ], - "reco" : [ - 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', - 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', - 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', - 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', - 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', - 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', - 'trackerGeometry.applyAlignment = True', - ], - "era" : "phase2_tracker, trackingPhase2PU140", - }, - "T31" : { - 1 : [ - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_OT800_IT615_2022_10/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerRecoMaterial.xml', - 'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseII/v1/trackingMaterialGroups_ForPhaseII.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - ], - "sim" : [ - 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *', - 'from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *', - ], - "reco" : [ - 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', - 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', - 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', - 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', - 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', - 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', - 'trackerGeometry.applyAlignment = True', - ], - "era" : "phase2_tracker, trackingPhase2PU140", - }, - "T32" : { - 1 : [ - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_OT800_IT615_2022_10/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/trackerRecoMaterial.xml', - 'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseII/v2/trackingMaterialGroups_ForPhaseII.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - ], - "sim" : [ - 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *', - 'from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *', - ], - "reco" : [ - 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', - 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', - 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', - 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', - 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', - 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', - 'trackerGeometry.applyAlignment = True', - ], - "era" : "phase2_tracker, phase2_3DPixels, trackingPhase2PU140", - }, - "T33" : { - 1 : [ - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_OT800_IT615_2022_10/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - ], - "sim" : [ - 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *', - 'from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *', - ], - "reco" : [ - 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', - 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', - 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', - 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', - 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', - 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', - 'trackerGeometry.applyAlignment = True', - ], - "era" : "phase2_tracker, phase2_3DPixels, trackingPhase2PU140", - }, - "T34" : { - 1 : [ - 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', - 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_OT800_IT615_2022_10/pixbar.xml', - 'Geometry/TrackerCommonData/data/trackermaterial.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_03/tracker.xml', - 'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixel.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', - 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerStructureTopology.xml', - 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelStructureTopology.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelsens.xml', - 'Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/trackerRecoMaterial.xml', - 'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseII/v2/trackingMaterialGroups_ForPhaseII.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - ], - "sim" : [ - 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *', - 'from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *', - ], - "reco" : [ - 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', - 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', - 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', - 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', - 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', - 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', - 'trackerGeometry.applyAlignment = True', - ], - "era" : "phase2_tracker, phase2_3DPixels, trackingPhase2PU140", - }, + "default" : 35, "T35" : { 1 : [ 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', @@ -537,341 +254,33 @@ 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml', 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelsens.xml', 'Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/trackerRecoMaterial.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml', - 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - ], - "sim" : [ - 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *', - 'from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *', - ], - "reco" : [ - 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', - 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', - 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', - 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', - 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', - 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', - 'trackerGeometry.applyAlignment = True', - ], - "era" : "phase2_tracker, phase2_3DPixels, trackingPhase2PU140", - }, - -} - - -caloDict = { - "abbrev" : "C", - "name" : "calo", - "default" : 18, - "C17" : { - 1 : [ - 'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml', - 'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml', - 'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v16/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v16/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v16/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v16/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v16/hgcalCons.xml', - 'Geometry/HGCalCommonData/data/hgcalConsData/v16/hgcalConsData.xml', - ], - 3 : [ - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv15.xml', - ], - 4 : [ - 'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', - ], - "sim" : [ - 'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *', - 'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *', - 'from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *', - 'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *' - ], - "reco" : [ - 'from Geometry.CaloEventSetup.HGCalTopology_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" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose", - }, - "C18" : { - 1 : [ - 'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml', - 'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml', - 'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', - 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v17/hgcalCons.xml', - 'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml', - ], - 3 : [ - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv15.xml', - ], - 4 : [ - 'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', - ], - "sim" : [ - 'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *', - 'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *', - 'from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *', - 'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *' - ], - "reco" : [ - 'from Geometry.CaloEventSetup.HGCalTopology_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" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose", - }, - "C19" : { - 1 : [ - 'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml', - 'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml', - 'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', - 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v17n/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v17n/hgcalCons.xml', - 'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml', - ], - 3 : [ - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv17n.xml', - ], - 4 : [ - 'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', - ], - "sim" : [ - 'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *', - 'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *', - 'from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *', - 'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *' - ], - "reco" : [ - 'from Geometry.CaloEventSetup.HGCalTopology_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" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose", - }, - "C20" : { - 1 : [ - 'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml', - 'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml', - 'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml', - 'Geometry/EcalCommonData/data/ebalgo.xml', - 'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml', - 'Geometry/EcalCommonData/data/ebrot.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', - 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v17/hgcalCons.xml', - 'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml', - 'Geometry/ForwardCommonData/data/hfnose/v4/hfnose.xml', - 'Geometry/ForwardCommonData/data/hfnoseCell/v1/hfnoseCell.xml', - 'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml', - 'Geometry/ForwardCommonData/data/hfnoseLayer/v2/hfnoseLayer.xml', - 'Geometry/ForwardCommonData/data/hfnoseCons/v1m/hfnoseCons.xml', - ], - 3 : [ - 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', - 'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil/2030/v5c/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv15.xml', - 'Geometry/ForwardSimData/data/hfnosesens.xml', - ], - 4 : [ - 'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml', - 'Geometry/EcalSimData/data/EcalProdCuts.xml', - 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', - 'Geometry/ForwardSimData/data/hfnoseProdCuts.xml', + 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml', + 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml', + 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', ], "sim" : [ - 'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *', - 'from Geometry.HcalCommonData.hcalDDDSimConstants_cff 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.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *', + 'from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *', ], "reco" : [ - 'from Geometry.CaloEventSetup.HGCalTopology_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 *', + 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', + 'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *', + 'from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *', + 'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *', + 'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *', + 'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *', + 'trackerGeometry.applyAlignment = True', ], - "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose", + "era" : "phase2_tracker, phase2_3DPixels, trackingPhase2PU140", }, - "C21" : { +} + + +caloDict = { + "abbrev" : "C", + "name" : "calo", + "default" : 25, + "C18" : { 1 : [ 'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml', 'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml', @@ -889,12 +298,13 @@ 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v17ng/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v17ng/hgcalwafer.xml', + 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', + 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', + 'Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml', 'Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml', 'Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml', 'Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v17ng/hgcalCons.xml', + 'Geometry/HGCalCommonData/data/hgcalCons/v17/hgcalCons.xml', 'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml', ], 3 : [ @@ -904,7 +314,7 @@ 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv17n.xml', + 'Geometry/HGCalSimData/data/hgcsensv15.xml', ], 4 : [ 'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml', @@ -944,7 +354,7 @@ ], "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose", }, - "C22" : { + "C19" : { 1 : [ 'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml', 'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml', @@ -962,14 +372,12 @@ 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v18/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v18/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalPassive/v18/hgcalPassive.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v18/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v18/hgcalCons.xml', + 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', + 'Geometry/HGCalCommonData/data/hgcalwafer/v17n/hgcalwafer.xml', + 'Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml', + 'Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml', + 'Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml', + 'Geometry/HGCalCommonData/data/hgcalCons/v17n/hgcalCons.xml', 'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml', ], 3 : [ @@ -979,7 +387,7 @@ 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv15.xml', + 'Geometry/HGCalSimData/data/hgcsensv17n.xml', ], 4 : [ 'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml', @@ -1017,9 +425,9 @@ 'from Geometry.EcalMapping.EcalMapping_cfi import *', 'from Geometry.EcalMapping.EcalMappingRecord_cfi import *', ], - "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose, phase2-hgcalV18", + "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose", }, - "C23" : { + "C20" : { 1 : [ 'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml', 'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml', @@ -1037,14 +445,19 @@ 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v18/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v18n/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalPassive/v18/hgcalPassive.xml', - 'Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml', - 'Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml', - 'Geometry/HGCalCommonData/data/hgcalHEmix/v18/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v18n/hgcalCons.xml', + 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', + 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', + 'Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml', + 'Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml', + 'Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml', + 'Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml', + 'Geometry/HGCalCommonData/data/hgcalCons/v17/hgcalCons.xml', 'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml', + 'Geometry/ForwardCommonData/data/hfnose/v4/hfnose.xml', + 'Geometry/ForwardCommonData/data/hfnoseCell/v1/hfnoseCell.xml', + 'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml', + 'Geometry/ForwardCommonData/data/hfnoseLayer/v2/hfnoseLayer.xml', + 'Geometry/ForwardCommonData/data/hfnoseCons/v1m/hfnoseCons.xml', ], 3 : [ 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', @@ -1052,23 +465,29 @@ 'Geometry/HcalSimData/data/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv17n.xml', + 'Geometry/HcalSimData/data/CaloUtil/2030/v5c/CaloUtil.xml', + 'Geometry/HGCalSimData/data/hgcsensv15.xml', + 'Geometry/ForwardSimData/data/hfnosesens.xml', ], 4 : [ 'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml', 'Geometry/EcalSimData/data/EcalProdCuts.xml', 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', + 'Geometry/ForwardSimData/data/hfnoseProdCuts.xml', ], "sim" : [ 'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *', 'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *', 'from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *', - 'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *' + 'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *', + 'from Geometry.ForwardCommonData.hfnoseParametersInitialization_cfi import *', + 'from Geometry.ForwardCommonData.hfnoseNumberingInitialization_cfi import *', ], "reco" : [ 'from Geometry.CaloEventSetup.HGCalTopology_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",', @@ -1078,7 +497,8 @@ ' "TOWER",', ' "HGCalEESensitive",', ' "HGCalHESiliconSensitive",', - ' "HGCalHEScintillatorSensitive"', + ' "HGCalHEScintillatorSensitive",', + ' "HGCalHFNoseSensitive",', ' )', ')', 'from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *', @@ -1091,9 +511,9 @@ 'from Geometry.EcalMapping.EcalMapping_cfi import *', 'from Geometry.EcalMapping.EcalMappingRecord_cfi import *', ], - "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose, phase2-hgcalV18", + "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose", }, - "C24" : { + "C22" : { 1 : [ 'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml', 'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml', @@ -1111,13 +531,14 @@ 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', - 'Geometry/HGCalCommonData/data/hgcal/v18ng/hgcal.xml', - 'Geometry/HGCalCommonData/data/hgcalwafer/v18ngr/hgcalwafer.xml', - 'Geometry/HGCalCommonData/data/hgcalPassive/v18ng/hgcalPassive.xml', + 'Geometry/HGCalCommonData/data/hgcal/v18/hgcal.xml', + 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', + 'Geometry/HGCalCommonData/data/hgcalwafer/v18/hgcalwafer.xml', + 'Geometry/HGCalCommonData/data/hgcalPassive/v18/hgcalPassive.xml', 'Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml', 'Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml', 'Geometry/HGCalCommonData/data/hgcalHEmix/v18/hgcalHEmix.xml', - 'Geometry/HGCalCommonData/data/hgcalCons/v18ng/hgcalCons.xml', + 'Geometry/HGCalCommonData/data/hgcalCons/v18/hgcalCons.xml', 'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml', ], 3 : [ @@ -1127,7 +548,7 @@ 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', 'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml', - 'Geometry/HGCalSimData/data/hgcsensv17n.xml', + 'Geometry/HGCalSimData/data/hgcsensv15.xml', ], 4 : [ 'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml', @@ -1470,54 +891,7 @@ muonDict = { "abbrev" : "M", "name" : "muon", - "default" : 14, - "M13" : { - 1 : [ - 'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml', - 'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml', - 'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml', - 'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml', - 'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml', - 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', - 'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml', - 'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml', - 'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml', - 'Geometry/MuonCommonData/data/rpcf/2030/v4/rpcf.xml', - 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', - 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', - 'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml', - 'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml', - 'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml', - 'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml', - ], - 2 : [ - 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml', - ], - 3 : [ - 'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml', - 'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', - 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', - 'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml', - 'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml', - 'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml', - ], - 4 : [ - 'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml', - ], - "sim" : [ - 'from Geometry.MuonNumbering.muonGeometryConstants_cff import *', - 'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *', - ], - "reco" : [ - 'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *', - 'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *', - 'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *', - 'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *', - 'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *', - ], - "era" : "phase2_muon, phase2_GEM, phase2_GE0", - }, + "default" : 16, "M14" : { 1 : [ 'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml', @@ -1716,91 +1090,7 @@ timingDict = { "abbrev" : "I", "name" : "timing", - "default" : 15, - "I14" : { - 1 : [ - 'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml', - 'Geometry/MTDCommonData/data/btl/v1/btl.xml', - 'Geometry/MTDCommonData/data/etl/v6/etl.xml', - 'Geometry/MTDCommonData/data/mtdParameters/v3/mtdStructureTopology.xml', - 'Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml', - ], - 3 : [ - 'Geometry/MTDSimData/data/v2/mtdsens.xml' - ], - 4 : [ - 'Geometry/MTDSimData/data/v2/mtdProdCuts.xml' - ], - "sim" : [ - 'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *', - ], - "reco" :[ - 'from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *', - 'from Geometry.MTDGeometryBuilder.mtdParameters_cff import *', - 'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *', - 'from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *', - 'from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *', - 'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *', - 'mtdGeometry.applyAlignment = False' - ], - "era" : "phase2_timing, phase2_timing_layer, phase2_etlV4", - }, - "I15" : { - 1 : [ - 'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml', - 'Geometry/MTDCommonData/data/btl/v1/btl.xml', - 'Geometry/MTDCommonData/data/etl/v7/etl.xml', - 'Geometry/MTDCommonData/data/mtdParameters/v3/mtdStructureTopology.xml', - 'Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml', - ], - 3 : [ - 'Geometry/MTDSimData/data/v2/mtdsens.xml' - ], - 4 : [ - 'Geometry/MTDSimData/data/v2/mtdProdCuts.xml' - ], - "sim" : [ - 'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *', - ], - "reco" :[ - 'from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *', - 'from Geometry.MTDGeometryBuilder.mtdParameters_cff import *', - 'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *', - 'from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *', - 'from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *', - 'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *', - 'mtdGeometry.applyAlignment = False' - ], - "era" : "phase2_timing, phase2_timing_layer, phase2_etlV4", - }, - "I16" : { - 1 : [ - 'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml', - 'Geometry/MTDCommonData/data/btl/v2/btl.xml', - 'Geometry/MTDCommonData/data/etl/v7/etl.xml', - 'Geometry/MTDCommonData/data/mtdParameters/v4/mtdStructureTopology.xml', - 'Geometry/MTDCommonData/data/mtdParameters/v4/mtdParameters.xml', - ], - 3 : [ - 'Geometry/MTDSimData/data/v4/mtdsens.xml' - ], - 4 : [ - 'Geometry/MTDSimData/data/v4/mtdProdCuts.xml' - ], - "sim" : [ - 'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *', - ], - "reco" :[ - 'from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *', - 'from Geometry.MTDGeometryBuilder.mtdParameters_cff import *', - 'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *', - 'from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *', - 'from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *', - 'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *', - 'mtdGeometry.applyAlignment = False' - ], - "era" : "phase2_timing, phase2_timing_layer, phase2_etlV4", - }, + "default" : 18, "I17" : { 1 : [ 'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml', @@ -1857,34 +1147,6 @@ ], "era" : "phase2_timing, phase2_timing_layer, phase2_etlV4", }, - "I19" : { - 1 : [ - 'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml', - 'Geometry/MTDCommonData/data/btl/v4/btl.xml', - 'Geometry/MTDCommonData/data/etl/v9/etl.xml', - 'Geometry/MTDCommonData/data/mtdParameters/v7/mtdStructureTopology.xml', - 'Geometry/MTDCommonData/data/mtdParameters/v7/mtdParameters.xml', - ], - 3 : [ - 'Geometry/MTDSimData/data/v5/mtdsens.xml' - ], - 4 : [ - 'Geometry/MTDSimData/data/v5/mtdProdCuts.xml' - ], - "sim" : [ - 'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *', - ], - "reco" :[ - 'from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *', - 'from Geometry.MTDGeometryBuilder.mtdParameters_cff import *', - 'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *', - 'from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *', - 'from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *', - 'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *', - 'mtdGeometry.applyAlignment = False' - ], - "era" : "phase2_timing, phase2_timing_layer, phase2_etlV4", - }, "I20" : { 1 : [ 'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml', @@ -1941,8 +1203,8 @@ ], "era" : "phase2_timing, phase2_timing_layer, phase2_etlV4", }, - "I22" : { - 1 : [ + "I22" : { + 1 : [ 'Geometry/MTDCommonData/data/mtdMaterial/v4/mtdMaterial.xml', 'Geometry/MTDCommonData/data/btl/v4/btl.xml', 'Geometry/MTDCommonData/data/etl/v12/etl.xml', @@ -1974,30 +1236,13 @@ allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict, timingDict ] detectorVersionDict = { - ("O9","T31","C17","M13","F8","I16") : "D95", - ("O9","T31","C18","M13","F8","I16") : "D96", - ("O9","T32","C17","M13","F8","I16") : "D98", - ("O9","T32","C18","M13","F8","I16") : "D99", - ("O9","T34","C17","M14","F8","I16") : "D100", - ("O9","T34","C18","M14","F8","I16") : "D101", - ("O9","T35","C17","M14","F8","I16") : "D102", - ("O9","T34","C21","M14","F8","I16") : "D103", ("O9","T35","C22","M14","F8","I17") : "D104", - ("O9","T35","C17","M14","F8","I17") : "D105", - ("O9","T35","C23","M14","F8","I17") : "D106", - ("O9","T32","C17","M14","F8","I17") : "D107", - ("O9","T35","C19","M14","F8","I17") : "D108", - ("O9","T35","C24","M14","F8","I17") : "D109", ("O9","T35","C18","M14","F8","I17") : "D110", ("O10","T36","C25","M15","F9","I17") : "D111", ("O10","T37","C25","M15","F9","I17") : "D112", ("O10","T38","C25","M15","F9","I17") : "D113", ("O9","T39","C19","M14","F8","I17") : "D114", ("O9","T35","C20","M14","F8","I17") : "D115", - ("O10","T35","C25","M15","F9","I17") : "D116", - ("O10","T35","C25","M15","F9","I18") : "D117", - ("O10","T35","C25","M15","F9","I19") : "D118", - ("O10","T35","C25","M15","F9","I20") : "D119", ("O11","T35","C26","M16","F9","I20") : "D120", ("O10","T35","C25","M16","F9","I18") : "D121", ("O11","T35","C27","M16","F9","I18") : "D122", @@ -2006,5 +1251,12 @@ ("O10","T35","C25","M16","F9","I22") : "D125", } -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", "D35", "D41", "D43", "D44", "D45", "D46", "D48", "D47", "D50", "D51", "D52", "D53", "D54", "D55", "D56", "D57", "D58", "D59", "D61", "D62", "D63", "D64", "D65", "D66", "D67", "D69", "D71", "D72", "D73", "D74", "D75", "D78", "D79", "D87", "D89", "D90", "D49", "D60", "D68", "D70", "D76", "D77", "D80", "D81", "D82", "D83", "D84", "D85","D86","D88","D91","D92","D93","D94","D97"]) -deprecatedSubdets = set([ "T1", "T2" ,"T3", "T4", "T5", "T6", "T7", "T8", "T9", "T10", "T11", "T12", "T13", "T14", "T15", "T16", "T17", "T18", "T19", "T20", "T21", "T22", "T23", "T24", "T25", "T26", "T27", "T28", "T29", "T30", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "C8", "C9", "C10", "C11", "C12", "C13", "C14", "C15", "C16", "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10","M11", "M12", "I1", "I2", "I3", "I4", "I5", "I6", "I7", "I8", "I9", "I10", "I11", "I12", "I13", "I14", "I15", "O1", "O2", "O3", "O4", "O5", "O6", "O7", "O8", "F1", "F2", "F3", "F4", "F5", "F6", "F7"]) +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", "D35", "D41", "D43", "D44", "D45", "D46", "D48", "D47", "D50", "D51", "D52", "D53", "D54", "D55", "D56", "D57", "D58", "D59", "D61", "D62", "D63", "D64", "D65", "D66", "D67", "D69", "D71", "D72", "D73", "D74", "D75", "D78", "D79", "D87", "D89", "D90", "D49", "D60", "D68", "D70", "D76", "D77", "D80", "D81", "D82", "D83", "D84", "D85","D86", "D88", "D91", "D92", "D93", "D94", "D95", "D96", "D97", "D98", "D99", "D100", "D101", "D102", "D103", "D105", "D106", "D107", "D108", "D109", "D116", "D117", "D118", "D119"]) +deprecatedSubdets = set([ + "T1", "T2" ,"T3", "T4", "T5", "T6", "T7", "T8", "T9", "T10", "T11", "T12", "T13", "T14", "T15", "T16", "T17", "T18", "T19", "T20", "T21", "T22", "T23", "T24", "T25", "T26", "T27", "T28", "T29", "T30", "T31", "T32", "T33", "T34", + "C1", "C2", "C3", "C4", "C5", "C6", "C7", "C8", "C9", "C10", "C11", "C12", "C13", "C14", "C15", "C16", "C17", "C21", "C23", "C24", + "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10", "M11", "M12", "M13", + "I1", "I2", "I3", "I4", "I5", "I6", "I7", "I8", "I9", "I10", "I11", "I12", "I13", "I14", "I15", "I16", "I19", + "O1", "O2", "O3", "O4", "O5", "O6", "O7", "O8", + "F1", "F2", "F3", "F4", "F5", "F6", "F7", +]) diff --git a/Configuration/PyReleaseValidation/python/relval_Run4.py b/Configuration/PyReleaseValidation/python/relval_Run4.py index 58c8f7e0dac32..584ed2bb85275 100644 --- a/Configuration/PyReleaseValidation/python/relval_Run4.py +++ b/Configuration/PyReleaseValidation/python/relval_Run4.py @@ -15,30 +15,13 @@ #Run4 WFs to run in IB (TTbar) numWFIB = [] -numWFIB.extend([23634.0]) #Run4D95 -numWFIB.extend([24034.0]) #Run4D96 -numWFIB.extend([24834.0]) #Run4D98 -numWFIB.extend([25234.0]) #Run4D99 -numWFIB.extend([25634.0]) #Run4D100 -numWFIB.extend([26034.0]) #Run4D101 -numWFIB.extend([26434.0]) #Run4D102 -numWFIB.extend([26834.0]) #Run4D103 numWFIB.extend([27234.0]) #Run4D104 -numWFIB.extend([27634.0]) #Run4D105 -numWFIB.extend([28034.0]) #Run4D106 -numWFIB.extend([28434.0]) #Run4D107 -numWFIB.extend([28834.0]) #Run4D108 -numWFIB.extend([29234.0]) #Run4D109 numWFIB.extend([29634.0]) #Run4D110 numWFIB.extend([30034.0]) #Run4D111 numWFIB.extend([30434.0]) #Run4D112 numWFIB.extend([30834.0]) #Run4D113 numWFIB.extend([31234.0]) #Run4D114 numWFIB.extend([32034.0]) #Run4D115 -numWFIB.extend([32434.0]) #Run4D116 -numWFIB.extend([32834.0]) #Run4D117 -numWFIB.extend([33234.0]) #Run4D118 -numWFIB.extend([33634.0]) #Run4D119 numWFIB.extend([34034.0]) #Run4D120 numWFIB.extend([34434.0]) #Run4D121 numWFIB.extend([34834.0]) #Run4D122 diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index f037097af6883..646419230607b 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -1309,9 +1309,9 @@ def genS(fragment,howMuch): steps['CosmicsSPLoose_UP17']=merge([{'cfg':'UndergroundCosmicSPLooseMu_cfi.py','-n':'2000','--conditions':'auto:phase1_2017_cosmics','--scenario':'cosmics','--era':'Run2_2017'},Kby(5000,500000),step1Up2015Defaults]) steps['CosmicsSPLoose_UP18']=merge([{'cfg':'UndergroundCosmicSPLooseMu_cfi.py','-n':'2000','--conditions':'auto:phase1_2018_cosmics','--scenario':'cosmics','--era':'Run2_2018'},Kby(5000,500000),step1Up2015Defaults]) -# Phase2 cosmics with geometry D98 +# Phase2 cosmics with geometry D121 from Configuration.PyReleaseValidation.upgradeWorkflowComponents import upgradeProperties -phase2CosInfo=upgradeProperties['Run4']['Run4D98'] # so if the default changes, change wf only here +phase2CosInfo=upgradeProperties['Run4']['Run4D121'] # so if the default changes, change wf only here steps['Cosmics_Phase2']=merge([{'cfg':'UndergroundCosmicMu_cfi.py', '-n':'500', @@ -4756,13 +4756,6 @@ def gen2024HiMix(fragment,howMuch): defaultDataSets["2026HLTOnDigi"] = defaultDataSets["2026SimOnGen"] = defaultDataSets['2026'] defaultDataSets['2024FS']='CMSSW_13_0_11-130X_mcRun3_2023_realistic_withEarly2023BS_v1_FastSim-v' #To replace with new dataset defaultDataSets['2025FS']='CMSSW_13_0_11-130X_mcRun3_2023_realistic_withEarly2023BS_v1_FastSim-v' #To replace with new dataset -defaultDataSets['Run4D49']='CMSSW_12_0_0_pre4-113X_mcRun4_realistic_v7_2026D49noPU-v' -defaultDataSets['Run4D76']='CMSSW_12_0_0_pre4-113X_mcRun4_realistic_v7_2026D76noPU-v' -defaultDataSets['Run4D77']='CMSSW_12_1_0_pre2-113X_mcRun4_realistic_v7_2026D77noPU-v' -defaultDataSets['Run4D88']='CMSSW_12_3_0_pre5-123X_mcRun4_realistic_v4_2026D88noPU-v' -defaultDataSets['Run4D95']='CMSSW_13_1_0_pre1-130X_mcRun4_realistic_v2_2026D95noPU-v' -defaultDataSets['Run4D96']='CMSSW_13_1_0_pre1-130X_mcRun4_realistic_v2_2026D96noPU-v' -defaultDataSets['Run4D98']='CMSSW_13_2_0_pre1-131X_mcRun4_realistic_v5_2026D98noPU-v' defaultDataSets['Run4D110']='CMSSW_15_1_0_pre5-150X_mcRun4_realistic_v1_STD_RegeneratedGS_Run4D110_noPU-v' defaultDataSets['Run4D121']='CMSSW_16_0_0_pre2-150X_mcRun4_realistic_v1_STD_RegeneratedGS_Run4D121_noPU-v' diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index d44d5a71bfc12..9a8aa6fa3a0ac 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -66,34 +66,8 @@ ] upgradeKeys['Run4'] = [ - 'Run4D95', - 'Run4D95PU', - 'Run4D96', - 'Run4D96PU', - 'Run4D98', - 'Run4D98PU', - 'Run4D99', - 'Run4D99PU', - 'Run4D100', - 'Run4D100PU', - 'Run4D101', - 'Run4D101PU', - 'Run4D102', - 'Run4D102PU', - 'Run4D103', - 'Run4D103PU', 'Run4D104', 'Run4D104PU', - 'Run4D105', - 'Run4D105PU', - 'Run4D106', - 'Run4D106PU', - 'Run4D107', - 'Run4D107PU', - 'Run4D108', - 'Run4D108PU', - 'Run4D109', - 'Run4D109PU', 'Run4D110', 'Run4D110PU', 'Run4D111', @@ -108,14 +82,6 @@ 'Run4D110SimOnGen', 'Run4D115', 'Run4D115PU', - 'Run4D116', - 'Run4D116PU', - 'Run4D117', - 'Run4D117PU', - 'Run4D118', - 'Run4D118PU', - 'Run4D119', - 'Run4D119PU', 'Run4D120', 'Run4D120PU', 'Run4D121', @@ -138,7 +104,9 @@ numWFSkip=200 # temporary measure to keep other WF numbers the same numWFConflict = [[14400,14800], #2022ReReco, 2022ReRecoPU (in 12_4) - [24400,24800], #D97 + [23600,27200], #D95-D103 + [27600,29600], #D105-D109 + [32400,34000], #D116-D119 [50000,51000]] numWFAll={ 2017: [], @@ -3630,111 +3598,6 @@ def condition(self, fragment, stepList, key, hasHarvest): upgradeProperties[2017][key+'PU']['ScenToRun'] = ['Gen','FastSimRun3PU','HARVESTFastRun3PU'] upgradeProperties['Run4'] = { - 'Run4D86' : { - 'Geom' : 'ExtendedRun4D86', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic_T21', - 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobalFakeHLT', 'HARVESTGlobalFakeHLT', 'ALCAPhase2'], - }, - 'Run4D88' : { - 'Geom' : 'ExtendedRun4D88', - 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T21', - 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], - }, - 'Run4D91' : { - 'Geom' : 'ExtendedRun4D91', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic_T30', - 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobalFakeHLT', 'HARVESTGlobalFakeHLT', 'ALCAPhase2'], - }, - 'Run4D92' : { - 'Geom' : 'ExtendedRun4D92', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic_T21', - 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobalFakeHLT', 'HARVESTGlobalFakeHLT', 'ALCAPhase2'], - }, - 'Run4D93' : { - 'Geom' : 'ExtendedRun4D93', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic_T21', - 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobalFakeHLT', 'HARVESTGlobalFakeHLT', 'ALCAPhase2'], - }, - 'Run4D94' : { - 'Geom' : 'ExtendedRun4D94', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic_T21', - 'Era' : 'Phase2C20I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobalFakeHLT', 'HARVESTGlobalFakeHLT', 'ALCAPhase2'], - }, - 'Run4D95' : { - 'Geom' : 'ExtendedRun4D95', - 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T21', - 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], - }, - 'Run4D96' : { - 'Geom' : 'ExtendedRun4D96', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic_T21', - 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobalFakeHLT', 'HARVESTGlobalFakeHLT', 'ALCAPhase2'], - }, - 'Run4D97' : { - 'Geom' : 'ExtendedRun4D97', - 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic_T25', - 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobalFakeHLT', 'HARVESTGlobalFakeHLT', 'ALCAPhase2'], - }, - 'Run4D98' : { - 'Geom' : 'ExtendedRun4D98', - 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T25', - 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], - }, - 'Run4D99' : { - 'Geom' : 'ExtendedRun4D99', - 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T25', - 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], - }, - 'Run4D100' : { - 'Geom' : 'ExtendedRun4D100', - 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T25', - 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], - }, - 'Run4D101' : { - 'Geom' : 'ExtendedRun4D101', - 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T25', - 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], - }, - 'Run4D102' : { - 'Geom' : 'ExtendedRun4D102', - 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', - 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], - }, - 'Run4D103' : { - 'Geom' : 'ExtendedRun4D103', - 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T25', - 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], - }, 'Run4D104' : { 'Geom' : 'ExtendedRun4D104', 'HLTmenu': '@relvalRun4', @@ -3742,41 +3605,6 @@ def condition(self, fragment, stepList, key, hasHarvest): 'Era' : 'Phase2C22I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - 'Run4D105' : { - 'Geom' : 'ExtendedRun4D105', - 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', - 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], - }, - 'Run4D106' : { - 'Geom' : 'ExtendedRun4D106', - 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', - 'Era' : 'Phase2C22I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], - }, - 'Run4D107' : { - 'Geom' : 'ExtendedRun4D107', - 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T25', - 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], - }, - 'Run4D108' : { - 'Geom' : 'ExtendedRun4D108', - 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', - 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], - }, - 'Run4D109' : { - 'Geom' : 'ExtendedRun4D109', - 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', - 'Era' : 'Phase2C22I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], - }, 'Run4D110' : { 'Geom' : 'ExtendedRun4D110', 'HLTmenu': '@relvalRun4', @@ -3834,34 +3662,6 @@ def condition(self, fragment, stepList, key, hasHarvest): 'Era' : 'Phase2C20I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - 'Run4D116' : { - 'Geom' : 'ExtendedRun4D116', - 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', - 'Era' : 'Phase2C22I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], - }, - 'Run4D117' : { - 'Geom' : 'ExtendedRun4D117', - 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', - 'Era' : 'Phase2C22I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], - }, - 'Run4D118' : { - 'Geom' : 'ExtendedRun4D118', - 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', - 'Era' : 'Phase2C22I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], - }, - 'Run4D119' : { - 'Geom' : 'ExtendedRun4D119', - 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', - 'Era' : 'Phase2C22I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], - }, 'Run4D120' : { 'Geom' : 'ExtendedRun4D120', 'HLTmenu': '@relvalRun4', diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py index e1efc18585580..1692f29c5d1db 100644 --- a/Configuration/StandardSequences/python/GeometryConf.py +++ b/Configuration/StandardSequences/python/GeometryConf.py @@ -88,34 +88,8 @@ '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', - 'ExtendedRun4D95' : 'ExtendedRun4D95,ExtendedRun4D95Reco', - 'DD4hepExtendedRun4D95' : 'DD4hepExtendedRun4D95,DD4hepExtendedRun4D95Reco', - 'ExtendedRun4D96' : 'ExtendedRun4D96,ExtendedRun4D96Reco', - 'DD4hepExtendedRun4D96' : 'DD4hepExtendedRun4D96,DD4hepExtendedRun4D96Reco', - 'ExtendedRun4D98' : 'ExtendedRun4D98,ExtendedRun4D98Reco', - 'DD4hepExtendedRun4D98' : 'DD4hepExtendedRun4D98,DD4hepExtendedRun4D98Reco', - 'ExtendedRun4D99' : 'ExtendedRun4D99,ExtendedRun4D99Reco', - 'DD4hepExtendedRun4D99' : 'DD4hepExtendedRun4D99,DD4hepExtendedRun4D99Reco', - 'ExtendedRun4D100' : 'ExtendedRun4D100,ExtendedRun4D100Reco', - 'DD4hepExtendedRun4D100' : 'DD4hepExtendedRun4D100,DD4hepExtendedRun4D100Reco', - 'ExtendedRun4D101' : 'ExtendedRun4D101,ExtendedRun4D101Reco', - 'DD4hepExtendedRun4D101' : 'DD4hepExtendedRun4D101,DD4hepExtendedRun4D101Reco', - 'ExtendedRun4D102' : 'ExtendedRun4D102,ExtendedRun4D102Reco', - 'DD4hepExtendedRun4D102' : 'DD4hepExtendedRun4D102,DD4hepExtendedRun4D102Reco', - 'ExtendedRun4D103' : 'ExtendedRun4D103,ExtendedRun4D103Reco', - 'DD4hepExtendedRun4D103' : 'DD4hepExtendedRun4D103,DD4hepExtendedRun4D103Reco', 'ExtendedRun4D104' : 'ExtendedRun4D104,ExtendedRun4D104Reco', 'DD4hepExtendedRun4D104' : 'DD4hepExtendedRun4D104,DD4hepExtendedRun4D104Reco', - 'ExtendedRun4D105' : 'ExtendedRun4D105,ExtendedRun4D105Reco', - 'DD4hepExtendedRun4D105' : 'DD4hepExtendedRun4D105,DD4hepExtendedRun4D105Reco', - 'ExtendedRun4D106' : 'ExtendedRun4D106,ExtendedRun4D106Reco', - 'DD4hepExtendedRun4D106' : 'DD4hepExtendedRun4D106,DD4hepExtendedRun4D106Reco', - 'ExtendedRun4D107' : 'ExtendedRun4D107,ExtendedRun4D107Reco', - 'DD4hepExtendedRun4D107' : 'DD4hepExtendedRun4D107,DD4hepExtendedRun4D107Reco', - 'ExtendedRun4D108' : 'ExtendedRun4D108,ExtendedRun4D108Reco', - 'DD4hepExtendedRun4D108' : 'DD4hepExtendedRun4D108,DD4hepExtendedRun4D108Reco', - 'ExtendedRun4D109' : 'ExtendedRun4D109,ExtendedRun4D109Reco', - 'DD4hepExtendedRun4D109' : 'DD4hepExtendedRun4D109,DD4hepExtendedRun4D109Reco', 'ExtendedRun4D110' : 'ExtendedRun4D110,ExtendedRun4D110Reco', 'DD4hepExtendedRun4D110' : 'DD4hepExtendedRun4D110,DD4hepExtendedRun4D110Reco', 'ExtendedRun4D111' : 'ExtendedRun4D111,ExtendedRun4D111Reco', @@ -128,14 +102,6 @@ 'DD4hepExtendedRun4D114' : 'DD4hepExtendedRun4D114,DD4hepExtendedRun4D114Reco', 'ExtendedRun4D115' : 'ExtendedRun4D115,ExtendedRun4D115Reco', 'DD4hepExtendedRun4D115' : 'DD4hepExtendedRun4D115,DD4hepExtendedRun4D115Reco', - 'ExtendedRun4D116' : 'ExtendedRun4D116,ExtendedRun4D116Reco', - 'DD4hepExtendedRun4D116' : 'DD4hepExtendedRun4D116,DD4hepExtendedRun4D116Reco', - 'ExtendedRun4D117' : 'ExtendedRun4D117,ExtendedRun4D117Reco', - 'DD4hepExtendedRun4D117' : 'DD4hepExtendedRun4D117,DD4hepExtendedRun4D117Reco', - 'ExtendedRun4D118' : 'ExtendedRun4D118,ExtendedRun4D118Reco', - 'DD4hepExtendedRun4D118' : 'DD4hepExtendedRun4D118,DD4hepExtendedRun4D118Reco', - 'ExtendedRun4D119' : 'ExtendedRun4D119,ExtendedRun4D119Reco', - 'DD4hepExtendedRun4D119' : 'DD4hepExtendedRun4D119,DD4hepExtendedRun4D119Reco', 'ExtendedRun4D120' : 'ExtendedRun4D120,ExtendedRun4D120Reco', 'DD4hepExtendedRun4D120' : 'DD4hepExtendedRun4D120,DD4hepExtendedRun4D120Reco', 'ExtendedRun4D121' : 'ExtendedRun4D121,ExtendedRun4D121Reco',