diff --git a/Alignment/OfflineValidation/test/inspectData_cfg.py b/Alignment/OfflineValidation/test/inspectData_cfg.py index 261e89d7f4b48..7aa97f2804648 100644 --- a/Alignment/OfflineValidation/test/inspectData_cfg.py +++ b/Alignment/OfflineValidation/test/inspectData_cfg.py @@ -69,7 +69,7 @@ from Configuration.PyReleaseValidation.upgradeWorkflowComponents import upgradeProperties ConditionsInfo = {} if 'D' in options.Detector: - ConditionsInfo = upgradeProperties[2026][options.Detector] # so if the default changes, change wf only here + ConditionsInfo = upgradeProperties['Run4'][options.Detector] # so if the default changes, change wf only here else: ConditionsInfo = upgradeProperties[2017][options.Detector] diff --git a/Alignment/OfflineValidation/test/testPrimaryVertexRelatedValidations_cfg.py b/Alignment/OfflineValidation/test/testPrimaryVertexRelatedValidations_cfg.py index e48edb0716234..d130460182536 100644 --- a/Alignment/OfflineValidation/test/testPrimaryVertexRelatedValidations_cfg.py +++ b/Alignment/OfflineValidation/test/testPrimaryVertexRelatedValidations_cfg.py @@ -109,7 +109,7 @@ class RefitType(Enum): # Standard loads ################################################################### if(options.isPhase2): - process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff') else: process.load("Configuration.Geometry.GeometryRecoDB_cff") diff --git a/Alignment/OfflineValidation/test/test_all_Phase2_cfg.py b/Alignment/OfflineValidation/test/test_all_Phase2_cfg.py index 3de1193b30170..7fc97f87d8b35 100644 --- a/Alignment/OfflineValidation/test/test_all_Phase2_cfg.py +++ b/Alignment/OfflineValidation/test/test_all_Phase2_cfg.py @@ -81,7 +81,7 @@ class RefitType(Enum): # Standard loads ################################################################### #process.load("Configuration.Geometry.GeometryRecoDB_cff") -process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff') #################################################################### # Get the BeamSpot diff --git a/Alignment/OfflineValidation/test/testingScripts/test_unitMiscellanea.sh b/Alignment/OfflineValidation/test/testingScripts/test_unitMiscellanea.sh index b1d3492198b35..37f8be7458f2c 100755 --- a/Alignment/OfflineValidation/test/testingScripts/test_unitMiscellanea.sh +++ b/Alignment/OfflineValidation/test/testingScripts/test_unitMiscellanea.sh @@ -5,7 +5,7 @@ echo "TESTING inspect ALCARECO data ..." cmsRun ${CMSSW_BASE}/src/Alignment/OfflineValidation/test/inspectData_cfg.py unitTest=True isCosmics=True trackCollection=ALCARECOTkAlCosmicsCTF0T || die "Failure running inspectData_cfg.py" $? echo "TESTING inspect Phase2 ALCARECO data ..." -cmsRun ${CMSSW_BASE}/src/Alignment/OfflineValidation/test/inspectData_cfg.py unitTest=True isCosmics=False globalTag='' trackCollection=ALCARECOTkAlZMuMu isDiMuonData=True Detector='2026D98' || die "Failure running inspectData_cfg.py on Phase-2 input" $? +cmsRun ${CMSSW_BASE}/src/Alignment/OfflineValidation/test/inspectData_cfg.py unitTest=True isCosmics=False globalTag='' trackCollection=ALCARECOTkAlZMuMu isDiMuonData=True Detector='Run4D98' || die "Failure running inspectData_cfg.py on Phase-2 input" $? echo "TESTING G4e refitter ..." cmsRun ${CMSSW_BASE}/src/Alignment/OfflineValidation/test/testG4Refitter_cfg.py maxEvents=10 || die "Failure running testG4Refitter_cfg.py" $? diff --git a/Alignment/TrackerAlignment/test/Misalignments/createRandomlyMisalignedGeometry_Phase2_cfg.py b/Alignment/TrackerAlignment/test/Misalignments/createRandomlyMisalignedGeometry_Phase2_cfg.py index 642ae88f81815..f2636c8ae1646 100644 --- a/Alignment/TrackerAlignment/test/Misalignments/createRandomlyMisalignedGeometry_Phase2_cfg.py +++ b/Alignment/TrackerAlignment/test/Misalignments/createRandomlyMisalignedGeometry_Phase2_cfg.py @@ -48,7 +48,7 @@ ################################################################### # Ideal geometry producer and standard includes ################################################################### -process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff') process.trackerGeometry.applyAlignment = True ################################################################### diff --git a/Alignment/TrackerAlignment/test/createTrackerAlignmentRcds_Phase2_cfg.py b/Alignment/TrackerAlignment/test/createTrackerAlignmentRcds_Phase2_cfg.py index 4269f37f9575c..37658b078bb43 100644 --- a/Alignment/TrackerAlignment/test/createTrackerAlignmentRcds_Phase2_cfg.py +++ b/Alignment/TrackerAlignment/test/createTrackerAlignmentRcds_Phase2_cfg.py @@ -23,7 +23,7 @@ process.load("Configuration.StandardSequences.MagneticField_cff") # B-field map if(options.Scenario == _settings.DEFAULT_VERSION): print("Loading default scenario: ", _settings.DEFAULT_VERSION) - process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff') else: process.load('Configuration.Geometry.GeometryExtended'+options.Scenario+'Reco_cff') process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") # Global tag diff --git a/CalibCalorimetry/HcalPlugins/test/hbhedarkeninganalyzer_cfg.py b/CalibCalorimetry/HcalPlugins/test/hbhedarkeninganalyzer_cfg.py index 517421ecba7d6..3ee305a82bab6 100644 --- a/CalibCalorimetry/HcalPlugins/test/hbhedarkeninganalyzer_cfg.py +++ b/CalibCalorimetry/HcalPlugins/test/hbhedarkeninganalyzer_cfg.py @@ -7,7 +7,7 @@ process.load("Configuration.StandardSequences.Services_cff") process.load("Configuration.Geometry.GeometryExtended2018Reco_cff") -#process.load("Configuration.Geometry.GeometryExtended2026D49Reco_cff") +#process.load("Configuration.Geometry.GeometryExtendedRun4D49Reco_cff") process.load("CalibCalorimetry.HcalPlugins.HBHEDarkening_cff") import CalibCalorimetry.HcalPlugins.Hcal_Conditions_forGlobalTag_cff diff --git a/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelBuilder_cfg.py b/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelBuilder_cfg.py index d98f4fd1f17fa..ed2bab7e97e33 100644 --- a/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelBuilder_cfg.py +++ b/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelBuilder_cfg.py @@ -24,8 +24,8 @@ ) ## specify the default phase2 detector -process.load("Configuration.Geometry.GeometryExtended2026Default_cff") -process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') +process.load("Configuration.Geometry.GeometryExtendedRun4Default_cff") +process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff') process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag diff --git a/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelReader_cfg.py b/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelReader_cfg.py index 0c6164baecf7b..aee3e655fb363 100644 --- a/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelReader_cfg.py +++ b/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelReader_cfg.py @@ -54,8 +54,8 @@ # Input data ################################################################### if(options.fromESSource): - process.load("Configuration.Geometry.GeometryExtended2026Default_cff") - process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') + process.load("Configuration.Geometry.GeometryExtendedRun4Default_cff") + process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff') process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, _PH2_GLOBAL_TAG, '') diff --git a/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleReader_cfg.py b/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleReader_cfg.py index 91ffe7b19f35c..08427d021ca07 100644 --- a/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleReader_cfg.py +++ b/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleReader_cfg.py @@ -53,8 +53,8 @@ # Input data ################################################################### if(options.fromESSource): - process.load("Configuration.Geometry.GeometryExtended2026Default_cff") - process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') + process.load("Configuration.Geometry.GeometryExtendedRun4Default_cff") + process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff') process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, _PH2_GLOBAL_TAG, '') diff --git a/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py b/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py index f06eb474c564b..b93bbf3f627e6 100644 --- a/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py +++ b/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py @@ -44,8 +44,8 @@ process.load("CondCore.CondDB.CondDB_cfi") process.CondDB.connect = cms.string(outdb) -process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') -process.load('Configuration.Geometry.GeometryExtended2026Default_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4Default_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.GlobalTag import GlobalTag diff --git a/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py b/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py index dd5933cdde33a..b77bd38d9039f 100644 --- a/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py +++ b/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py @@ -186,8 +186,8 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger = cms.Service("MessageLogger", destinations = cms.untracked.vstring('SiPixel2DTemplateDBObjectUploader_Phase2.log')) -process.load('Configuration.Geometry.GeometryExtended2026D110_cff') -process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D110_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff') process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.GlobalTag, '') diff --git a/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py b/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py index bb72ba4f4406e..10167359ca115 100644 --- a/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py +++ b/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py @@ -179,25 +179,25 @@ recoGeometry_cff = '' tGeometry = options.geometry if tGeometry == 'T5': - geometry_cff = 'GeometryExtended2026D17_cff' - recoGeometry_cff = 'GeometryExtended2026D17Reco_cff' + geometry_cff = 'GeometryExtendedRun4D17_cff' + recoGeometry_cff = 'GeometryExtendedRun4D17Reco_cff' LA_value = 0.106 tag = 'SiPixelLorentzAngle_Phase2_T5' elif tGeometry == 'T6': - geometry_cff = 'GeometryExtended2026D35_cff' - recoGeometry_cff = 'GeometryExtended2026D35Reco_cff' + geometry_cff = 'GeometryExtendedRun4D35_cff' + recoGeometry_cff = 'GeometryExtendedRun4D35Reco_cff' elif tGeometry == 'T14': - geometry_cff = 'GeometryExtended2026D43_cff' - recoGeometry_cff = 'GeometryExtended2026D43Reco_cff' + geometry_cff = 'GeometryExtendedRun4D43_cff' + recoGeometry_cff = 'GeometryExtendedRun4D43Reco_cff' elif tGeometry == 'T15': - geometry_cff = 'GeometryExtended2026D49_cff' - recoGeometry_cff = 'GeometryExtended2026D49Reco_cff' + geometry_cff = 'GeometryExtendedRun4D49_cff' + recoGeometry_cff = 'GeometryExtendedRun4D49Reco_cff' elif tGeometry == 'T21': - geometry_cff = 'GeometryExtended2026D88_cff' - recoGeometry_cff = 'GeometryExtended2026D88Reco_cff' + geometry_cff = 'GeometryExtendedRun4D88_cff' + recoGeometry_cff = 'GeometryExtendedRun4D88Reco_cff' elif tGeometry == 'T33': - geometry_cff = 'GeometryExtended2026D110_cff' - recoGeometry_cff = 'GeometryExtended2026D110Reco_cff' + geometry_cff = 'GeometryExtendedRun4D110_cff' + recoGeometry_cff = 'GeometryExtendedRun4D110Reco_cff' else: print("Unknown tracker geometry") print("What are you doing ?!?!?!?!") diff --git a/CondTools/SiPixel/test/SiPixelLorentzAngleDBLoader_Phase2_cfg.py b/CondTools/SiPixel/test/SiPixelLorentzAngleDBLoader_Phase2_cfg.py index db03a97191c58..d9dec244c9529 100644 --- a/CondTools/SiPixel/test/SiPixelLorentzAngleDBLoader_Phase2_cfg.py +++ b/CondTools/SiPixel/test/SiPixelLorentzAngleDBLoader_Phase2_cfg.py @@ -58,15 +58,15 @@ tag = 'SiPixelLorentzAngle_Phase2_T15' elif tGeometry == 'T25': - geometry_cff = 'GeometryExtended2026D97_cff' - recoGeometry_cff = 'GeometryExtended2026D97Reco_cff' + geometry_cff = 'GeometryExtendedRun4D97_cff' + recoGeometry_cff = 'GeometryExtendedRun4D97Reco_cff' has3DinL1 = True LA_value = 0.0503 tag = 'SiPixelLorentzAngle_Phase2_T25_v1' elif tGeometry == 'T33': - geometry_cff = 'GeometryExtended2026D102_cff' - recoGeometry_cff = 'GeometryExtended2026D102Reco_cff' + geometry_cff = 'GeometryExtendedRun4D102_cff' + recoGeometry_cff = 'GeometryExtendedRun4D102Reco_cff' has3DinL1 = True LA_value = 0.0503 tag = 'SiPixelLorentzAngle_Phase2_T33_v1' diff --git a/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py b/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py index 59c9a6b896d2b..a81b44a76a480 100644 --- a/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py +++ b/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py @@ -184,20 +184,20 @@ LA_value = 0.106 tag = 'SiPixelLorentzAngle_Phase2_T5' elif tGeometry == 'T6': - geometry_cff = 'GeometryExtended2026D35_cff' - recoGeometry_cff = 'GeometryExtended2026D35Reco_cff' + geometry_cff = 'GeometryExtendedRun4D35_cff' + recoGeometry_cff = 'GeometryExtendedRun4D35Reco_cff' elif tGeometry == 'T14': - geometry_cff = 'GeometryExtended2026D43_cff' - recoGeometry_cff = 'GeometryExtended2026D43Reco_cff' + geometry_cff = 'GeometryExtendedRun4D43_cff' + recoGeometry_cff = 'GeometryExtendedRun4D43Reco_cff' elif tGeometry == 'T15': - geometry_cff = 'GeometryExtended2026D49_cff' - recoGeometry_cff = 'GeometryExtended2026D49Reco_cff' + geometry_cff = 'GeometryExtendedRun4D49_cff' + recoGeometry_cff = 'GeometryExtendedRun4D49Reco_cff' elif tGeometry == 'T21': - geometry_cff = 'GeometryExtended2026D92_cff' - recoGeometry_cff = 'GeometryExtended2026D92Reco_cff' + geometry_cff = 'GeometryExtendedRun4D92_cff' + recoGeometry_cff = 'GeometryExtendedRun4D92Reco_cff' elif tGeometry == 'T33': - geometry_cff = 'GeometryExtended2026D110_cff' - recoGeometry_cff = 'GeometryExtended2026D110Reco_cff' + geometry_cff = 'GeometryExtendedRun4D110_cff' + recoGeometry_cff = 'GeometryExtendedRun4D110Reco_cff' else: print("Unknown tracker geometry") print("What are you doing ?!?!?!?!") diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md index 8d351470700a5..1e8c40f1a6112 100644 --- a/Configuration/Geometry/README.md +++ b/Configuration/Geometry/README.md @@ -10,7 +10,7 @@ vi python/dict2021Geometry.py python3 ./scripts/generate2021Geometry.py -D 2021 ``` Note: -* For Phase-2, use [generate2026Geometry.py](./scripts/generate2026Geometry.py) and [dict2026Geometry.py](./python/dict2026Geometry.py) instead. +* For Phase-2, use [generateRun4Geometry.py](./scripts/generateRun4Geometry.py) and [dictRun4Geometry.py](./python/dictRun4Geometry.py) instead. * For the list of geometries, see below. # Run 3 Geometries @@ -68,7 +68,7 @@ Several detector combinations have been generated: # Phase 2 Geometries -The Phase 2 geometries are automatically created using the script [generate2026Geometry.py](./scripts/generate2026Geometry.py). +The Phase 2 geometries are automatically created using the script [generateRun4Geometry.py](./scripts/generateRun4Geometry.py). Different versions of various subdetectors can be combined. The available versions are: @@ -91,21 +91,21 @@ Tracker: * 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 2026D49) -* C10: HGCal (as in C9) + HFNose with corrected wafer size + Phase2 HCAL and EB (used in 2026D60) -* 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 2026D68) -* 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 2026D70, 2026D84) -* 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 2026D76-81, 2026D85, 2026D87) -* C15: HGCal (as in C14) + HFNose with corrected wafer size + Phase2 HCAL and EB (used in 2026D82) -* 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 2026D83) -* 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 2026D86, 2025D88) -* 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 2026D92) -* 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 2026D93) -* C20: HGCal (v17 version of HGCal geometry as in C18) + HFNose with corrected wafer size + Phase2 HCAL and EB (used in 2026D93) -* C21: HGCal (v17 version of HGCal geometry as in C19 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in 2026D101) -* 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 2026D104) -* 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 2026D106) -* C24: HGCal (v18 version of HGCal geometry as in C122 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in 2026D109) +* 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 C122 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in Run4D109) 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 diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D104Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D104Reco_cff.py deleted file mode 100644 index abc0b5b68853d..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D104Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D104_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/GeometryDD4hepExtended2026D104_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D104_cff.py deleted file mode 100644 index 15e07147063a4..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D104_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.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/cmsExtendedGeometry2026D104.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/GeometryDD4hepExtended2026D105Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D105Reco_cff.py deleted file mode 100644 index 9a9b642cc0e7b..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D105Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D105_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/GeometryDD4hepExtended2026D105_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D105_cff.py deleted file mode 100644 index 6a59004b7209b..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D105_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.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/cmsExtendedGeometry2026D105.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/GeometryDD4hepExtended2026D106Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D106Reco_cff.py deleted file mode 100644 index 7f3847aae79a0..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D106Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D106_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/GeometryDD4hepExtended2026D106_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D106_cff.py deleted file mode 100644 index bb29835215c1d..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D106_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.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/cmsExtendedGeometry2026D106.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/GeometryDD4hepExtended2026D107Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D107Reco_cff.py deleted file mode 100644 index 0ae25ae4d9168..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D107Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D107_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/GeometryDD4hepExtended2026D107_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D107_cff.py deleted file mode 100644 index 59a5c7249f773..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D107_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.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/cmsExtendedGeometry2026D107.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/GeometryDD4hepExtended2026D108Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D108Reco_cff.py deleted file mode 100644 index afaa9cab3da10..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D108Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D108_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/GeometryDD4hepExtended2026D108_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D108_cff.py deleted file mode 100644 index 79e677f7d91d5..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D108_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.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/cmsExtendedGeometry2026D108.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/GeometryDD4hepExtended2026D109Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D109Reco_cff.py deleted file mode 100644 index 15b5b5bb12f47..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D109Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D109_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/GeometryDD4hepExtended2026D109_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D109_cff.py deleted file mode 100644 index a9648c08fab01..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D109_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.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/cmsExtendedGeometry2026D109.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/GeometryDD4hepExtended2026D110Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D110Reco_cff.py deleted file mode 100644 index 9c897d92a5501..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D110Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D110_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/GeometryDD4hepExtended2026D110_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D110_cff.py deleted file mode 100644 index e3f089b396fa5..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D110_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.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/cmsExtendedGeometry2026D110.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/GeometryDD4hepExtended2026D111Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D111Reco_cff.py deleted file mode 100644 index da19f297ba36c..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D111Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D111_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/GeometryDD4hepExtended2026D111_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D111_cff.py deleted file mode 100644 index 44201ee729c30..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D111_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.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/cmsExtendedGeometry2026D111.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/GeometryDD4hepExtended2026D112Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D112Reco_cff.py deleted file mode 100644 index d538f1ac22139..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D112Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D112_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/GeometryDD4hepExtended2026D112_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D112_cff.py deleted file mode 100644 index c69486d25ba09..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D112_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.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/cmsExtendedGeometry2026D112.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/GeometryDD4hepExtended2026D113Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D113Reco_cff.py deleted file mode 100644 index 544cdfda2841f..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D113Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D113_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/GeometryDD4hepExtended2026D113_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D113_cff.py deleted file mode 100644 index 3536cf68e48b2..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D113_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.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/cmsExtendedGeometry2026D113.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/GeometryDD4hepExtended2026D114Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D114Reco_cff.py deleted file mode 100644 index ca5c1c5d012d4..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D114Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D114_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/GeometryDD4hepExtended2026D114_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D114_cff.py deleted file mode 100644 index a45bb985a72e5..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D114_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.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/cmsExtendedGeometry2026D114.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/GeometryDD4hepExtended2026D100Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D100Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D100Reco_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D100Reco_cff.py index 1fb5096f5c83e..e02c760b756f5 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D100Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D100Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryDD4hepExtended2026D100_cff import * +from Configuration.Geometry.GeometryDD4hepExtendedRun4D100_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D102_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D100_cff.py similarity index 87% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D102_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D100_cff.py index 10fa0c418988b..50c146d6df848 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D102_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D100_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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/cmsExtendedGeometry2026D102.xml") +DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D100.xml") from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D102Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D101Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D102Reco_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D101Reco_cff.py index ee1ed6634c223..88c677f682c02 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D102Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D101Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryDD4hepExtended2026D102_cff import * +from Configuration.Geometry.GeometryDD4hepExtendedRun4D101_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D100_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D101_cff.py similarity index 87% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D100_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D101_cff.py index 266b2d2c1f9bd..8ae15a505e189 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D100_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D101_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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/cmsExtendedGeometry2026D100.xml") +DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D101.xml") from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D101Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D102Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D101Reco_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D102Reco_cff.py index 94745c5f3a113..bdf887392e578 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D101Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D102Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryDD4hepExtended2026D101_cff import * +from Configuration.Geometry.GeometryDD4hepExtendedRun4D102_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D103_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D102_cff.py similarity index 87% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D103_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D102_cff.py index 7c16321d6b2c7..37fe4ec87d28f 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D103_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D102_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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/cmsExtendedGeometry2026D103.xml") +DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D102.xml") from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D103Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D103Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D103Reco_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D103Reco_cff.py index daca1e59cebd3..871d6b56f6982 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D103Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D103Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryDD4hepExtended2026D103_cff import * +from Configuration.Geometry.GeometryDD4hepExtendedRun4D103_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D101_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D103_cff.py similarity index 87% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D101_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D103_cff.py index 89a1249c4c70a..97891c39d5f79 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D101_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D103_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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/cmsExtendedGeometry2026D101.xml") +DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D103.xml") from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D104Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D104Reco_cff.py new file mode 100644 index 0000000000000..dddab569f1f59 --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D104Reco_cff.py @@ -0,0 +1,61 @@ +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.GeometryDD4hepExtendedRun4D104_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/GeometryDD4hepExtendedRun4D104_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D104_cff.py new file mode 100644 index 0000000000000..7ebad20ced860 --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D104_cff.py @@ -0,0 +1,17 @@ +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/cmsExtendedGeometryRun4D104.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 new file mode 100644 index 0000000000000..942f3caeb199b --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D105Reco_cff.py @@ -0,0 +1,61 @@ +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 new file mode 100644 index 0000000000000..7bcf9eb2ca947 --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D105_cff.py @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000000000..b6a34eafb8186 --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D106Reco_cff.py @@ -0,0 +1,61 @@ +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 new file mode 100644 index 0000000000000..434309f67f15d --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D106_cff.py @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000000000..7ecd8ccb54948 --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D107Reco_cff.py @@ -0,0 +1,61 @@ +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 new file mode 100644 index 0000000000000..5fa6849887d6e --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D107_cff.py @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000000000..34dabf5a5fbe7 --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D108Reco_cff.py @@ -0,0 +1,61 @@ +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 new file mode 100644 index 0000000000000..26b48fccbf0db --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D108_cff.py @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000000000..ea708db64748a --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D109Reco_cff.py @@ -0,0 +1,61 @@ +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 new file mode 100644 index 0000000000000..b2e3658e2d81a --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D109_cff.py @@ -0,0 +1,17 @@ +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/GeometryDD4hepExtendedRun4D110Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D110Reco_cff.py new file mode 100644 index 0000000000000..a9154289c32e0 --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D110Reco_cff.py @@ -0,0 +1,61 @@ +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.GeometryDD4hepExtendedRun4D110_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/GeometryDD4hepExtendedRun4D110_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D110_cff.py new file mode 100644 index 0000000000000..00702b8a6608b --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D110_cff.py @@ -0,0 +1,17 @@ +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/cmsExtendedGeometryRun4D110.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/GeometryDD4hepExtendedRun4D111Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D111Reco_cff.py new file mode 100644 index 0000000000000..3a91e2f354ad5 --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D111Reco_cff.py @@ -0,0 +1,61 @@ +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.GeometryDD4hepExtendedRun4D111_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/GeometryDD4hepExtendedRun4D111_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D111_cff.py new file mode 100644 index 0000000000000..6322c18c6c354 --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D111_cff.py @@ -0,0 +1,17 @@ +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/cmsExtendedGeometryRun4D111.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/GeometryDD4hepExtendedRun4D112Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D112Reco_cff.py new file mode 100644 index 0000000000000..fab9925c7e38f --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D112Reco_cff.py @@ -0,0 +1,61 @@ +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.GeometryDD4hepExtendedRun4D112_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/GeometryDD4hepExtendedRun4D112_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D112_cff.py new file mode 100644 index 0000000000000..b80f547d97267 --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D112_cff.py @@ -0,0 +1,17 @@ +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/cmsExtendedGeometryRun4D112.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/GeometryDD4hepExtendedRun4D113Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D113Reco_cff.py new file mode 100644 index 0000000000000..8ce5bb0ea0aa1 --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D113Reco_cff.py @@ -0,0 +1,61 @@ +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.GeometryDD4hepExtendedRun4D113_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/GeometryDD4hepExtendedRun4D113_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D113_cff.py new file mode 100644 index 0000000000000..611800ad245ed --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D113_cff.py @@ -0,0 +1,17 @@ +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/cmsExtendedGeometryRun4D113.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/GeometryDD4hepExtendedRun4D114Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D114Reco_cff.py new file mode 100644 index 0000000000000..6990924389b6e --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D114Reco_cff.py @@ -0,0 +1,61 @@ +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.GeometryDD4hepExtendedRun4D114_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/GeometryDD4hepExtendedRun4D114_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D114_cff.py new file mode 100644 index 0000000000000..4f412bc9694c0 --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D114_cff.py @@ -0,0 +1,17 @@ +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/cmsExtendedGeometryRun4D114.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/GeometryDD4hepExtended2026D115Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D115Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D115Reco_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D115Reco_cff.py index 68ab49124feae..b477da50c0a96 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D115Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D115Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryDD4hepExtended2026D115_cff import * +from Configuration.Geometry.GeometryDD4hepExtendedRun4D115_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D115_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D115_cff.py similarity index 89% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D115_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D115_cff.py index a89579c77e852..4f5f0675c084a 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D115_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D115_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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/cmsExtendedGeometry2026D115.xml") +DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D115.xml") from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D95Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D95Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D95Reco_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D95Reco_cff.py index 6e8a1df4691d2..41e14722c4231 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D95Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D95Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryDD4hepExtended2026D95_cff import * +from Configuration.Geometry.GeometryDD4hepExtendedRun4D95_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D95_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D95_cff.py similarity index 87% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D95_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D95_cff.py index e670fbe287e7f..a2c6b51e80437 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D95_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D95_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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/cmsExtendedGeometry2026D95.xml") +DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D95.xml") from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D96Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D96Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D96Reco_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D96Reco_cff.py index 7823384af01a8..6990a7f6bc4ea 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D96Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D96Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryDD4hepExtended2026D96_cff import * +from Configuration.Geometry.GeometryDD4hepExtendedRun4D96_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D96_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D96_cff.py similarity index 87% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D96_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D96_cff.py index 51eaaefd93e92..3d65563a85699 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D96_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D96_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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/cmsExtendedGeometry2026D96.xml") +DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D96.xml") from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D98Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D98Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D98Reco_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D98Reco_cff.py index 8ec7600cb6ba0..9497809f0d82c 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D98Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D98Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryDD4hepExtended2026D98_cff import * +from Configuration.Geometry.GeometryDD4hepExtendedRun4D98_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D98_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D98_cff.py similarity index 87% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D98_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D98_cff.py index deb9d6a907450..20172f67bc6ed 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D98_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D98_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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/cmsExtendedGeometry2026D98.xml") +DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98.xml") from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D99Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D99Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D99Reco_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D99Reco_cff.py index cac36be8033ac..80a0dc852bc05 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D99Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D99Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryDD4hepExtended2026D99_cff import * +from Configuration.Geometry.GeometryDD4hepExtendedRun4D99_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D99_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D99_cff.py similarity index 87% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026D99_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4D99_cff.py index 9a1bdb27b1102..c4c1e4ddd49d8 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D99_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D99_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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/cmsExtendedGeometry2026D99.xml") +DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D99.xml") from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026DefaultReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4DefaultReco_cff.py similarity index 100% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026DefaultReco_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4DefaultReco_cff.py diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026Default_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4Default_cff.py similarity index 100% rename from Configuration/Geometry/python/GeometryDD4hepExtended2026Default_cff.py rename to Configuration/Geometry/python/GeometryDD4hepExtendedRun4Default_cff.py diff --git a/Configuration/Geometry/python/GeometryExtended2026D104Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D104Reco_cff.py deleted file mode 100644 index d1cfbf24e261c..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D104Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D104_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/GeometryExtended2026D104_cff.py b/Configuration/Geometry/python/GeometryExtended2026D104_cff.py deleted file mode 100644 index 21b389af810e6..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D104_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D104XML_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/GeometryExtended2026D105Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D105Reco_cff.py deleted file mode 100644 index 814938b68f110..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D105Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D105_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/GeometryExtended2026D105_cff.py b/Configuration/Geometry/python/GeometryExtended2026D105_cff.py deleted file mode 100644 index ec9939d2a8250..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D105_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D105XML_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/GeometryExtended2026D106Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D106Reco_cff.py deleted file mode 100644 index d8346d2ac1ea9..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D106Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D106_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/GeometryExtended2026D106_cff.py b/Configuration/Geometry/python/GeometryExtended2026D106_cff.py deleted file mode 100644 index 345f92c4142e0..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D106_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D106XML_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/GeometryExtended2026D107Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D107Reco_cff.py deleted file mode 100644 index 4b82c552f245b..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D107Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D107_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/GeometryExtended2026D107_cff.py b/Configuration/Geometry/python/GeometryExtended2026D107_cff.py deleted file mode 100644 index ede48066e90af..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D107_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D107XML_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/GeometryExtended2026D108Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D108Reco_cff.py deleted file mode 100644 index 20e9a72c2860a..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D108Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D108_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/GeometryExtended2026D108_cff.py b/Configuration/Geometry/python/GeometryExtended2026D108_cff.py deleted file mode 100644 index 6109dc7300bea..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D108_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D108XML_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/GeometryExtended2026D109Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D109Reco_cff.py deleted file mode 100644 index 2fdd4236d5228..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D109Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D109_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/GeometryExtended2026D109_cff.py b/Configuration/Geometry/python/GeometryExtended2026D109_cff.py deleted file mode 100644 index fe1c68ec6ddb4..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D109_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D109XML_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/GeometryExtended2026D110Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D110Reco_cff.py deleted file mode 100644 index fbe4d56d6a7ab..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D110Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D110_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/GeometryExtended2026D110_cff.py b/Configuration/Geometry/python/GeometryExtended2026D110_cff.py deleted file mode 100644 index f6a00207093f1..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D110_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D110XML_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/GeometryExtended2026D111Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D111Reco_cff.py deleted file mode 100644 index 26ebcb225e70c..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D111Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D111_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/GeometryExtended2026D111_cff.py b/Configuration/Geometry/python/GeometryExtended2026D111_cff.py deleted file mode 100644 index ec6a6772c5a3c..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D111_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D111XML_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/GeometryExtended2026D112Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D112Reco_cff.py deleted file mode 100644 index 61fe9282b447c..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D112Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D112_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/GeometryExtended2026D112_cff.py b/Configuration/Geometry/python/GeometryExtended2026D112_cff.py deleted file mode 100644 index 8cdd77ba4908a..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D112_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D112XML_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/GeometryExtended2026D113Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D113Reco_cff.py deleted file mode 100644 index ebb04a34ec4c2..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D113Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D113_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/GeometryExtended2026D113_cff.py b/Configuration/Geometry/python/GeometryExtended2026D113_cff.py deleted file mode 100644 index ab6d733fc82e5..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D113_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D113XML_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/GeometryExtended2026D114Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D114Reco_cff.py deleted file mode 100644 index 54b0964fea2a2..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D114Reco_cff.py +++ /dev/null @@ -1,61 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D114_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/GeometryExtended2026D114_cff.py b/Configuration/Geometry/python/GeometryExtended2026D114_cff.py deleted file mode 100644 index 47a93a40c9471..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D114_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D114XML_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/GeometryExtended2026D100Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D100Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryExtended2026D100Reco_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D100Reco_cff.py index cb5dfd51d2f65..cb068f1ee30dc 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D100Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D100Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryExtended2026D100_cff import * +from Configuration.Geometry.GeometryExtendedRun4D100_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D100_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D100_cff.py similarity index 85% rename from Configuration/Geometry/python/GeometryExtended2026D100_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D100_cff.py index 983cb8f4e85f6..e3b496b2a000a 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D100_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D100_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.cmsExtendedGeometry2026D100XML_cfi import * +from Geometry.CMSCommonData.cmsExtendedGeometryRun4D100XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D101Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D101Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryExtended2026D101Reco_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D101Reco_cff.py index f6ab84a3adbb8..6b678cd7688d6 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D101Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D101Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryExtended2026D101_cff import * +from Configuration.Geometry.GeometryExtendedRun4D101_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D101_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D101_cff.py similarity index 85% rename from Configuration/Geometry/python/GeometryExtended2026D101_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D101_cff.py index 785878c65579d..bed56377fecc6 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D101_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D101_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.cmsExtendedGeometry2026D101XML_cfi import * +from Geometry.CMSCommonData.cmsExtendedGeometryRun4D101XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D102Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D102Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryExtended2026D102Reco_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D102Reco_cff.py index 0920f3ba0a7c9..cf36420bb9b57 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D102Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D102Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryExtended2026D102_cff import * +from Configuration.Geometry.GeometryExtendedRun4D102_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D102_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D102_cff.py similarity index 85% rename from Configuration/Geometry/python/GeometryExtended2026D102_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D102_cff.py index 6101eaa6a79b9..8a948c37adcea 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D102_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D102_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.cmsExtendedGeometry2026D102XML_cfi import * +from Geometry.CMSCommonData.cmsExtendedGeometryRun4D102XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D103Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D103Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryExtended2026D103Reco_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D103Reco_cff.py index 7999287b21b02..72f2ee09ce10e 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D103Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D103Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryExtended2026D103_cff import * +from Configuration.Geometry.GeometryExtendedRun4D103_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D103_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D103_cff.py similarity index 85% rename from Configuration/Geometry/python/GeometryExtended2026D103_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D103_cff.py index 5cf8a5feced7d..4ef7e675d2d51 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D103_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D103_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.cmsExtendedGeometry2026D103XML_cfi import * +from Geometry.CMSCommonData.cmsExtendedGeometryRun4D103XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D104Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D104Reco_cff.py new file mode 100644 index 0000000000000..8a3c45d1eef74 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D104Reco_cff.py @@ -0,0 +1,61 @@ +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.GeometryExtendedRun4D104_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/GeometryExtendedRun4D104_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D104_cff.py new file mode 100644 index 0000000000000..bf737798cbaa7 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D104_cff.py @@ -0,0 +1,15 @@ +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.cmsExtendedGeometryRun4D104XML_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 new file mode 100644 index 0000000000000..f9814798dd07b --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D105Reco_cff.py @@ -0,0 +1,61 @@ +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 new file mode 100644 index 0000000000000..2b84287037dbe --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D105_cff.py @@ -0,0 +1,15 @@ +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 new file mode 100644 index 0000000000000..3c767ff22ed76 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D106Reco_cff.py @@ -0,0 +1,61 @@ +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 new file mode 100644 index 0000000000000..fb69caad47837 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D106_cff.py @@ -0,0 +1,15 @@ +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 new file mode 100644 index 0000000000000..2d64c4dd8946f --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D107Reco_cff.py @@ -0,0 +1,61 @@ +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 new file mode 100644 index 0000000000000..8e04bacadda1a --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D107_cff.py @@ -0,0 +1,15 @@ +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 new file mode 100644 index 0000000000000..eeaf92b111321 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D108Reco_cff.py @@ -0,0 +1,61 @@ +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 new file mode 100644 index 0000000000000..a4ac3ef17b2e8 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D108_cff.py @@ -0,0 +1,15 @@ +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 new file mode 100644 index 0000000000000..80a4ccd2a3b61 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D109Reco_cff.py @@ -0,0 +1,61 @@ +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 new file mode 100644 index 0000000000000..e373d1ef42d22 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D109_cff.py @@ -0,0 +1,15 @@ +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/GeometryExtendedRun4D110Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D110Reco_cff.py new file mode 100644 index 0000000000000..e4c045d0bf0a4 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D110Reco_cff.py @@ -0,0 +1,61 @@ +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.GeometryExtendedRun4D110_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/GeometryExtendedRun4D110_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D110_cff.py new file mode 100644 index 0000000000000..a28c1f2fe2634 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D110_cff.py @@ -0,0 +1,15 @@ +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.cmsExtendedGeometryRun4D110XML_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/GeometryExtendedRun4D111Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D111Reco_cff.py new file mode 100644 index 0000000000000..9216caf8d3d55 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D111Reco_cff.py @@ -0,0 +1,61 @@ +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.GeometryExtendedRun4D111_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/GeometryExtendedRun4D111_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D111_cff.py new file mode 100644 index 0000000000000..aeaec5f0f3ba7 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D111_cff.py @@ -0,0 +1,15 @@ +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.cmsExtendedGeometryRun4D111XML_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/GeometryExtendedRun4D112Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D112Reco_cff.py new file mode 100644 index 0000000000000..155793c0fb91a --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D112Reco_cff.py @@ -0,0 +1,61 @@ +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.GeometryExtendedRun4D112_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/GeometryExtendedRun4D112_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D112_cff.py new file mode 100644 index 0000000000000..9eedef5aae1bc --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D112_cff.py @@ -0,0 +1,15 @@ +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.cmsExtendedGeometryRun4D112XML_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/GeometryExtendedRun4D113Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D113Reco_cff.py new file mode 100644 index 0000000000000..87d23a39d1a25 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D113Reco_cff.py @@ -0,0 +1,61 @@ +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.GeometryExtendedRun4D113_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/GeometryExtendedRun4D113_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D113_cff.py new file mode 100644 index 0000000000000..6250353ba1e9c --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D113_cff.py @@ -0,0 +1,15 @@ +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.cmsExtendedGeometryRun4D113XML_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/GeometryExtendedRun4D114Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D114Reco_cff.py new file mode 100644 index 0000000000000..4951a73a27b15 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D114Reco_cff.py @@ -0,0 +1,61 @@ +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.GeometryExtendedRun4D114_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/GeometryExtendedRun4D114_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D114_cff.py new file mode 100644 index 0000000000000..1618d0ff4492c --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D114_cff.py @@ -0,0 +1,15 @@ +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.cmsExtendedGeometryRun4D114XML_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/GeometryExtended2026D115Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D115Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryExtended2026D115Reco_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D115Reco_cff.py index 218dd943172d0..034874931581f 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D115Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D115Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryExtended2026D115_cff import * +from Configuration.Geometry.GeometryExtendedRun4D115_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D115_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D115_cff.py similarity index 87% rename from Configuration/Geometry/python/GeometryExtended2026D115_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D115_cff.py index 01a499e7f4ec4..017cd44360837 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D115_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D115_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.cmsExtendedGeometry2026D115XML_cfi import * +from Geometry.CMSCommonData.cmsExtendedGeometryRun4D115XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D95Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D95Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryExtended2026D95Reco_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D95Reco_cff.py index c099632c44944..9c838b7ed539c 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D95Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D95Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryExtended2026D95_cff import * +from Configuration.Geometry.GeometryExtendedRun4D95_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D95_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D95_cff.py similarity index 85% rename from Configuration/Geometry/python/GeometryExtended2026D95_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D95_cff.py index 403b200074d01..e592e7e0e169a 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D95_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D95_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.cmsExtendedGeometry2026D95XML_cfi import * +from Geometry.CMSCommonData.cmsExtendedGeometryRun4D95XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D96Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D96Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryExtended2026D96Reco_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D96Reco_cff.py index f0f03e13c38ab..ad0d3baa1595b 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D96Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D96Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryExtended2026D96_cff import * +from Configuration.Geometry.GeometryExtendedRun4D96_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D96_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D96_cff.py similarity index 85% rename from Configuration/Geometry/python/GeometryExtended2026D96_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D96_cff.py index f35214340a044..d508c2645f0a3 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D96_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D96_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.cmsExtendedGeometry2026D96XML_cfi import * +from Geometry.CMSCommonData.cmsExtendedGeometryRun4D96XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D98Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D98Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryExtended2026D98Reco_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D98Reco_cff.py index b26a480b042ac..d5d195d567cc1 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D98Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D98Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryExtended2026D98_cff import * +from Configuration.Geometry.GeometryExtendedRun4D98_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D98_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D98_cff.py similarity index 85% rename from Configuration/Geometry/python/GeometryExtended2026D98_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D98_cff.py index 2c1f36413595c..471db00b127a6 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D98_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D98_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.cmsExtendedGeometry2026D98XML_cfi import * +from Geometry.CMSCommonData.cmsExtendedGeometryRun4D98XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D99Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D99Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryExtended2026D99Reco_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D99Reco_cff.py index e75bb5089385d..69d21f290cad7 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D99Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D99Reco_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.GeometryExtended2026D99_cff import * +from Configuration.Geometry.GeometryExtendedRun4D99_cff import * # tracker from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D99_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D99_cff.py similarity index 85% rename from Configuration/Geometry/python/GeometryExtended2026D99_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4D99_cff.py index 336b41f3ffb26..a92355b7ca6da 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D99_cff.py +++ b/Configuration/Geometry/python/GeometryExtendedRun4D99_cff.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# 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.cmsExtendedGeometry2026D99XML_cfi import * +from Geometry.CMSCommonData.cmsExtendedGeometryRun4D99XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026DefaultReco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4DefaultReco_cff.py similarity index 100% rename from Configuration/Geometry/python/GeometryExtended2026DefaultReco_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4DefaultReco_cff.py diff --git a/Configuration/Geometry/python/GeometryExtended2026Default_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4Default_cff.py similarity index 100% rename from Configuration/Geometry/python/GeometryExtended2026Default_cff.py rename to Configuration/Geometry/python/GeometryExtendedRun4Default_cff.py diff --git a/Configuration/Geometry/python/defaultPhase2ConditionsEra_cff.py b/Configuration/Geometry/python/defaultPhase2ConditionsEra_cff.py index 5b9b4bfea644f..9fa25a87a4bb1 100644 --- a/Configuration/Geometry/python/defaultPhase2ConditionsEra_cff.py +++ b/Configuration/Geometry/python/defaultPhase2ConditionsEra_cff.py @@ -2,7 +2,7 @@ from Configuration.AlCa.autoCond import autoCond from Configuration.StandardSequences.Eras import eras -DEFAULT_VERSION = "2026D110" +DEFAULT_VERSION = "Run4D110" def get_era_and_conditions(version_key): """Retrieve the era and global tag for a given version key. @@ -16,12 +16,12 @@ def get_era_and_conditions(version_key): Raises: KeyError: If the version key or global tag is not found. """ - # Ensure the version key exists in the properties for 2026 - if version_key not in properties[2026]: - raise KeyError(f"Version key '{version_key}' not found in properties[2026].") + # Ensure the version key exists in the properties for Run4 + if version_key not in properties['Run4']: + raise KeyError(f"Version key '{version_key}' not found in properties['Run4'].") # Retrieve the global tag key - global_tag_key = properties[2026][version_key]['GT'] + global_tag_key = properties['Run4'][version_key]['GT'] print(f"Global tag key from properties: {global_tag_key}") # Validate the existence of the global tag in autoCond @@ -30,7 +30,7 @@ def get_era_and_conditions(version_key): raise KeyError(f"Global tag key '{global_tag_key}' not found in autoCond.") # Retrieve the era key and get the corresponding era object - era_key = properties[2026][version_key]['Era'] + era_key = properties['Run4'][version_key]['Era'] print(f"Constructed era key from properties: {era_key}") era = getattr(eras, era_key) diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dictRun4Geometry.py similarity index 100% rename from Configuration/Geometry/python/dict2026Geometry.py rename to Configuration/Geometry/python/dictRun4Geometry.py diff --git a/Configuration/Geometry/python/generateGeometry.py b/Configuration/Geometry/python/generateGeometry.py index 1037ef52dbd75..677909bf2ac6d 100644 --- a/Configuration/Geometry/python/generateGeometry.py +++ b/Configuration/Geometry/python/generateGeometry.py @@ -203,7 +203,7 @@ def generateGeom(self, detectorTuple, args): if not 'Extended'+self.detectorYear+detectorVersion in GeometryConf.keys(): print("Please add this line in Configuration/StandardSequences/python/GeometryConf.py:") print(" 'Extended"+self.detectorYear+detectorVersion+"' : 'Extended"+self.detectorYear+detectorVersion+",Extended"+self.detectorYear+detectorVersion+"Reco',") - if self.detectorYear == "2026" and int(args.v_detector) > self.dd4hepDetectorVersion: + if self.detectorYear == "Run4" and int(args.v_detector) > self.dd4hepDetectorVersion: print(" 'DD4hepExtended"+self.detectorYear+detectorVersion+"' : 'DD4hepExtended"+self.detectorYear+detectorVersion+",DD4hepExtended"+self.detectorYear+detectorVersion+"Reco',") errorList = [] diff --git a/Configuration/Geometry/scripts/generate2026Geometry.py b/Configuration/Geometry/scripts/generate2026Geometry.py deleted file mode 100644 index 56fcdca08366f..0000000000000 --- a/Configuration/Geometry/scripts/generate2026Geometry.py +++ /dev/null @@ -1,7 +0,0 @@ -from Configuration.Geometry.dict2026Geometry import * -from Configuration.Geometry.generateGeometry import * - -if __name__ == "__main__": - # create geometry generator object w/ 2026 content and run it - generator2026 = GeometryGenerator("generate2026Geometry.py",999,"D","2026",maxSections,allDicts,detectorVersionDict,deprecatedDets,deprecatedSubdets) - generator2026.run() diff --git a/Configuration/Geometry/scripts/generateRun4Geometry.py b/Configuration/Geometry/scripts/generateRun4Geometry.py new file mode 100644 index 0000000000000..47babe11e4ab5 --- /dev/null +++ b/Configuration/Geometry/scripts/generateRun4Geometry.py @@ -0,0 +1,7 @@ +from Configuration.Geometry.dictRun4Geometry import * +from Configuration.Geometry.generateGeometry import * + +if __name__ == "__main__": + # create geometry generator object w/ Run4 content and run it + generatorRun4 = GeometryGenerator("generateRun4Geometry.py",999,"D","Run4",maxSections,allDicts,detectorVersionDict,deprecatedDets,deprecatedSubdets) + generatorRun4.run() diff --git a/Configuration/Geometry/test/BuildFile.xml b/Configuration/Geometry/test/BuildFile.xml index c96ff1eb2e1e7..146a92819d938 100644 --- a/Configuration/Geometry/test/BuildFile.xml +++ b/Configuration/Geometry/test/BuildFile.xml @@ -1,4 +1,4 @@ - + diff --git a/Configuration/HLT/python/autoHLT.py b/Configuration/HLT/python/autoHLT.py index dbe417c2ce84f..3dd065640edb4 100644 --- a/Configuration/HLT/python/autoHLT.py +++ b/Configuration/HLT/python/autoHLT.py @@ -14,6 +14,6 @@ 'relval2023' : 'Fake2', 'relval2024' : 'Fake2', 'relval2025' : 'GRun', - 'relval2026' : '75e33', + 'relvalRun4' : '75e33', 'test' : 'GRun', } diff --git a/Configuration/PyReleaseValidation/README.md b/Configuration/PyReleaseValidation/README.md index d81e40e7c55f5..a3c4177c0fcb8 100644 --- a/Configuration/PyReleaseValidation/README.md +++ b/Configuration/PyReleaseValidation/README.md @@ -9,7 +9,7 @@ runTheMatrix.py --what upgrade -n To make an upgrade workflow visible to the regular matrix, add it to: * [relval_2017.py](./python/relval_2017.py) (for Run 2 and Run 3) -* [relval_2026.py](./python/relval_2026.py) (for Phase 2) +* [relval_Run4.py](./python/relval_Run4.py) (for Phase 2) All workflows in the regular matrix can be run in IB tests, so this should only be done for fully functional workflows. diff --git a/Configuration/PyReleaseValidation/python/MatrixInjector.py b/Configuration/PyReleaseValidation/python/MatrixInjector.py index ec99d2fdf2661..331461774c5b7 100644 --- a/Configuration/PyReleaseValidation/python/MatrixInjector.py +++ b/Configuration/PyReleaseValidation/python/MatrixInjector.py @@ -328,7 +328,7 @@ def get_wmsplit(): wmsplit['HARVESTRUN3'] = 1 # automate for phase 2 from .upgradeWorkflowComponents import upgradeKeys - for key in upgradeKeys[2026]: + for key in upgradeKeys['Run4']: if 'PU' not in key: continue diff --git a/Configuration/PyReleaseValidation/python/MatrixReader.py b/Configuration/PyReleaseValidation/python/MatrixReader.py index a4c63b599e16a..68c94a0c0952b 100644 --- a/Configuration/PyReleaseValidation/python/MatrixReader.py +++ b/Configuration/PyReleaseValidation/python/MatrixReader.py @@ -51,7 +51,7 @@ def reset(self, what='all'): 'relval_cleanedupgrade':'clnupg-', 'relval_gpu':'gpu-', 'relval_2017':'2017-', - 'relval_2026':'2026-', + 'relval_Run4':'Run4-', 'relval_identity':'id-', 'relval_machine': 'mach-', 'relval_premix': 'premix-', @@ -70,7 +70,7 @@ def reset(self, what='all'): 'relval_cleanedupgrade', 'relval_gpu', 'relval_2017', - 'relval_2026', + 'relval_Run4', 'relval_identity', 'relval_machine', 'relval_premix', @@ -88,7 +88,7 @@ def reset(self, what='all'): 'relval_cleanedupgrade':False, 'relval_gpu':False, 'relval_2017':True, - 'relval_2026':True, + 'relval_Run4':True, 'relval_identity':False, 'relval_machine':True, 'relval_premix':True, diff --git a/Configuration/PyReleaseValidation/python/relval_2026.py b/Configuration/PyReleaseValidation/python/relval_Run4.py similarity index 71% rename from Configuration/PyReleaseValidation/python/relval_2026.py rename to Configuration/PyReleaseValidation/python/relval_Run4.py index ff4d24a46f583..3b866ca55c000 100644 --- a/Configuration/PyReleaseValidation/python/relval_2026.py +++ b/Configuration/PyReleaseValidation/python/relval_Run4.py @@ -13,28 +13,28 @@ #just define all of them prefixDet = 29600 #update this line when change the default version -#2026 WFs to run in IB (TTbar) +#Run4 WFs to run in IB (TTbar) numWFIB = [] -numWFIB.extend([23634.0]) #2026D95 -numWFIB.extend([24034.0]) #2026D96 -numWFIB.extend([24834.0]) #2026D98 -numWFIB.extend([25234.0]) #2026D99 -numWFIB.extend([25634.0]) #2026D100 -numWFIB.extend([26034.0]) #2026D101 -numWFIB.extend([26434.0]) #2026D102 -numWFIB.extend([26834.0]) #2026D103 -numWFIB.extend([27234.0]) #2026D104 -numWFIB.extend([27634.0]) #2026D105 -numWFIB.extend([28034.0]) #2026D106 -numWFIB.extend([28434.0]) #2026D107 -numWFIB.extend([28834.0]) #2026D108 -numWFIB.extend([29234.0]) #2026D109 -numWFIB.extend([29634.0]) #2026D110 -numWFIB.extend([30034.0]) #2026D111 -numWFIB.extend([30434.0]) #2026D112 -numWFIB.extend([30834.0]) #2026D113 -numWFIB.extend([31234.0]) #2026D114 -numWFIB.extend([32034.0]) #2026D115 +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 #Additional sample for short matrix and IB #Default Phase-2 Det NoPU diff --git a/Configuration/PyReleaseValidation/python/relval_cleanedupgrade.py b/Configuration/PyReleaseValidation/python/relval_cleanedupgrade.py index a4036aea3d3ed..20ab0f4580a19 100644 --- a/Configuration/PyReleaseValidation/python/relval_cleanedupgrade.py +++ b/Configuration/PyReleaseValidation/python/relval_cleanedupgrade.py @@ -14,7 +14,7 @@ from Configuration.PyReleaseValidation.relval_ged import workflows as _ged from Configuration.PyReleaseValidation.relval_gpu import workflows as _gpu from Configuration.PyReleaseValidation.relval_2017 import workflows as _2017 -from Configuration.PyReleaseValidation.relval_2026 import workflows as _2026 +from Configuration.PyReleaseValidation.relval_Run4 import workflows as _Run4 from Configuration.PyReleaseValidation.relval_machine import workflows as _machine from Configuration.PyReleaseValidation.relval_premix import workflows as _premix @@ -23,7 +23,7 @@ numWFIB = [] for upgrade_wf in _upgrade_workflows: veto = False - for matrixToVeto in [_standard, _highstats, _pileup, _generator, _extendedgen, _production, _ged, _gpu, _2017, _2026, _machine, _premix]: + for matrixToVeto in [_standard, _highstats, _pileup, _generator, _extendedgen, _production, _ged, _gpu, _2017, _Run4, _machine, _premix]: if upgrade_wf in matrixToVeto: veto = True break diff --git a/Configuration/PyReleaseValidation/python/relval_gpu.py b/Configuration/PyReleaseValidation/python/relval_gpu.py index b770900fc1332..f71ade3f646f1 100644 --- a/Configuration/PyReleaseValidation/python/relval_gpu.py +++ b/Configuration/PyReleaseValidation/python/relval_gpu.py @@ -34,7 +34,7 @@ # Alpaka pixel-only quadruplets: ZMM with PU: any backend, any backend vs cpu validation, profiling # Alpaka pixel-only triplets: ZMM with PU: any backend, any backend vs cpu validation, profiling # Alpaka pixel-only quadruplets: Single Nu E10 with PU: any backend -# mc 2026 +# mc Run4 # no PU # Alpaka pixel-only: TTbar: quadruplets any backend, any backend vs cpu validation, profiling, triplets # Alpaka pixel-only: Single Nu E10: any backend @@ -69,11 +69,11 @@ 13050.406, 13050.407, 13050.408, 13061.402, - # 2026, Alpaka-based noPU + # Run4, Alpaka-based noPU 29634.402, 29634.403, 29634.404, 29634.406, 29661.402, - # 2026, Alpaka-based PU + # Run4, Alpaka-based PU 29834.402, 29834.403, 29834.404 ] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index ef0594eadc985..9705a52433e0b 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -1213,7 +1213,7 @@ def genS(fragment,howMuch): # Phase2 cosmics with geometry D98 from Configuration.PyReleaseValidation.upgradeWorkflowComponents import upgradeProperties -phase2CosInfo=upgradeProperties[2026]['2026D98'] # so if the default changes, change wf only here +phase2CosInfo=upgradeProperties['Run4']['Run4D98'] # so if the default changes, change wf only here steps['Cosmics_Phase2']=merge([{'cfg':'UndergroundCosmicMu_cfi.py', '-n':'500', @@ -4366,7 +4366,7 @@ def gen2024HiMix(fragment,howMuch): ####From this line till the end of the file : ####UPGRADE WORKFLOWS IN PREPARATION - Gaelle's sandbox - #####Accessible only through the option --what upgrade -#####(unless specifically added to relval_2026.py) +#####(unless specifically added to relval_Run4.py) #####Transparent for any of the standard workflows #### list of worflows defined (not necessarly running though): runTheMatrix.py --what upgrade -n #### @@ -4390,14 +4390,14 @@ def gen2024HiMix(fragment,howMuch): defaultDataSets['2024HLTOnDigi'] = defaultDataSets["2024SimOnGen"] = defaultDataSets['2024'] defaultDataSets["2025HLTOnDigi"] = defaultDataSets["2025SimOnGen"] = defaultDataSets['2025'] defaultDataSets['2024FS']='CMSSW_13_0_11-130X_mcRun3_2023_realistic_withEarly2023BS_v1_FastSim-v' #To replace with new dataset -defaultDataSets['2026D49']='CMSSW_12_0_0_pre4-113X_mcRun4_realistic_v7_2026D49noPU-v' -defaultDataSets['2026D76']='CMSSW_12_0_0_pre4-113X_mcRun4_realistic_v7_2026D76noPU-v' -defaultDataSets['2026D77']='CMSSW_12_1_0_pre2-113X_mcRun4_realistic_v7_2026D77noPU-v' -defaultDataSets['2026D88']='CMSSW_12_3_0_pre5-123X_mcRun4_realistic_v4_2026D88noPU-v' -defaultDataSets['2026D95']='CMSSW_13_1_0_pre1-130X_mcRun4_realistic_v2_2026D95noPU-v' -defaultDataSets['2026D96']='CMSSW_13_1_0_pre1-130X_mcRun4_realistic_v2_2026D96noPU-v' -defaultDataSets['2026D98']='CMSSW_13_2_0_pre1-131X_mcRun4_realistic_v5_2026D98noPU-v' -defaultDataSets['2026D110']='CMSSW_14_1_0-141X_mcRun4_realistic_v1_STD_RegeneratedGS_2026D110_noPU-v' +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_14_1_0-141X_mcRun4_realistic_v1_STD_RegeneratedGS_2026D110_noPU-v' ## HIN defaultDataSets['2023HIN']='CCMSSW_14_1_0-PU_140X_mcRun3_2023_realistic_HI_v4_STD_2023HIN_PU-v' @@ -4561,7 +4561,7 @@ def gen2024HiMix(fragment,howMuch): '--outputCommands' : '"drop *_*_*_GEN,drop *_*_*_DIGI2RAW"' } - upgradeStepDict['HLT75e33'][k] = {'-s':'HLT:@relval2026', + upgradeStepDict['HLT75e33'][k] = {'-s':'HLT:@relvalRun4', '--processName':'HLTX', '--conditions':gt, '--datatier':'FEVT', diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 9179ed3810d31..fbfd6b28801aa 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -50,55 +50,55 @@ '2025GenOnly', ] -upgradeKeys[2026] = [ - '2026D95', - '2026D95PU', - '2026D96', - '2026D96PU', - '2026D98', - '2026D98PU', - '2026D99', - '2026D99PU', - '2026D100', - '2026D100PU', - '2026D101', - '2026D101PU', - '2026D102', - '2026D102PU', - '2026D103', - '2026D103PU', - '2026D104', - '2026D104PU', - '2026D105', - '2026D105PU', - '2026D106', - '2026D106PU', - '2026D107', - '2026D107PU', - '2026D108', - '2026D108PU', - '2026D109', - '2026D109PU', - '2026D110', - '2026D110PU', - '2026D111', - '2026D111PU', - '2026D112', - '2026D112PU', - '2026D113', - '2026D113PU', - '2026D114', - '2026D114PU', - '2026D110GenOnly', - '2026D110SimOnGen', - '2026D115', - '2026D115PU', +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', + 'Run4D111PU', + 'Run4D112', + 'Run4D112PU', + 'Run4D113', + 'Run4D113PU', + 'Run4D114', + 'Run4D114PU', + 'Run4D110GenOnly', + 'Run4D110SimOnGen', + 'Run4D115', + 'Run4D115PU', ] # pre-generation of WF numbers numWFStart={ 2017: 10000, - 2026: 23600, + 'Run4': 23600, } numWFSkip=200 # temporary measure to keep other WF numbers the same @@ -107,7 +107,7 @@ [50000,51000]] numWFAll={ 2017: [], - 2026: [] + 'Run4': [] } for year in upgradeKeys: @@ -414,7 +414,7 @@ def setup__(self, step, stepName, stepDict, k, properties): elif 'ALCA' in step: stepDict[stepName][k] = None elif 'HARVEST' in step: stepDict[stepName][k] = merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'}, stepDict[step][k]]) def condition_(self, fragment, stepList, key, hasHarvest): - return ('2022' in key or '2023' in key or '2024' in key or '2026' in key or 'HI' in key) and ('FS' not in key) + return ('2022' in key or '2023' in key or '2024' in key or 'Run4' in key or 'HI' in key) and ('FS' not in key) upgradeWFs['pixelTrackingOnly'] = UpgradeWorkflow_pixelTrackingOnly( steps = [ 'Reco', @@ -473,7 +473,7 @@ class UpgradeWorkflow_trackingMkFitPhase2(UpgradeWorkflowTracking): def setup__(self, step, stepName, stepDict, k, properties): if 'Reco' in step: stepDict[stepName][k] = merge([self.step3, stepDict[step][k]]) def condition_(self, fragment, stepList, key, hasHarvest): - return ('2026' in key) + return ('Run4' in key) upgradeWFs['trackingMkFitPhase2'] = UpgradeWorkflow_trackingMkFitPhase2( steps = [ 'Reco', @@ -556,7 +556,7 @@ class UpgradeWorkflow_vectorHits(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): stepDict[stepName][k] = merge([{'--procModifiers': 'vectorHits'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return (fragment=="TTbar_14TeV" or fragment=="SingleMuPt10Extended") and '2026' in key + return (fragment=="TTbar_14TeV" or fragment=="SingleMuPt10Extended") and 'Run4' in key upgradeWFs['vectorHits'] = UpgradeWorkflow_vectorHits( steps = [ 'RecoGlobal', @@ -613,7 +613,7 @@ def setup_(self, step, stepName, stepDict, k, properties): def condition(self, fragment, stepList, key, hasHarvest): # select only a subset of the workflows selected = (fragment == "TTbar_14TeV") and ('FS' not in key) and hasHarvest - result = selected and any(y in key for y in ['2021','2024','2025','2026']) + result = selected and any(y in key for y in ['2021','2024','2025','Run4']) return result @@ -649,7 +649,7 @@ def setup_(self, step, stepName, stepDict, k, properties): if 'HARVESTGlobal' in step: stepDict[stepName][k] = merge([self.step4, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return (fragment=="TTbar_14TeV" or 'CloseByPGun_CE' in fragment) and '2026' in key + return (fragment=="TTbar_14TeV" or 'CloseByPGun_CE' in fragment) and 'Run4' in key upgradeWFs['ticl_clue3D'] = UpgradeWorkflow_ticl_clue3D( steps = [ 'RecoGlobal', @@ -672,7 +672,7 @@ def setup_(self, step, stepName, stepDict, k, properties): if 'HARVESTGlobal' in step: stepDict[stepName][k] = merge([self.step4, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return (fragment=="TTbar_14TeV" or 'CloseByPGun_CE' in fragment) and '2026' in key + return (fragment=="TTbar_14TeV" or 'CloseByPGun_CE' in fragment) and 'Run4' in key upgradeWFs['ticl_FastJet'] = UpgradeWorkflow_ticl_FastJet( steps = [ 'RecoGlobal', @@ -697,7 +697,7 @@ def setup_(self, step, stepName, stepDict, k, properties): if 'HARVESTGlobal' in step: stepDict[stepName][k] = merge([self.step4, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return (fragment=="TTbar_14TeV" or 'CloseByP' in fragment or 'Eta1p7_2p7' in fragment) and '2026' in key + return (fragment=="TTbar_14TeV" or 'CloseByP' in fragment or 'Eta1p7_2p7' in fragment) and 'Run4' in key upgradeWFs['ticl_v5'] = UpgradeWorkflow_ticl_v5( steps = [ @@ -728,7 +728,7 @@ def setup_(self, step, stepName, stepDict, k, properties): if 'HARVESTGlobal' in step: stepDict[stepName][k] = merge([self.step4, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return (fragment=="ZEE_14" or 'Eta1p7_2p7' in fragment) and '2026' in key + return (fragment=="ZEE_14" or 'Eta1p7_2p7' in fragment) and 'Run4' in key upgradeWFs['ticl_v5_superclustering_mustache_ticl'] = UpgradeWorkflow_ticl_v5_superclustering( steps = [ 'HLTOnly', @@ -879,7 +879,7 @@ def condition(self, fragment, stepList, key, hasHarvest): # Patatrack workflows (NoPU and PU): # - TTbar_14, ZMM_14", ZEE_14, ZTT_14, NuGun, SingleMu, QCD_Pt15To7000_Flat for -# > 2021, 2022, 2023, 2024 and 2026 conditions, TTbar +# > 2021, 2022, 2023, 2024 and Run4 conditions, TTbar # - Hydjet for HI conditions class PatatrackWorkflow(UpgradeWorkflow): def __init__(self, digi = {}, reco = {}, mini = {}, harvest = {}, **kwargs): @@ -936,7 +936,7 @@ def __init__(self, digi = {}, reco = {}, mini = {}, harvest = {}, **kwargs): def condition(self, fragment, stepList, key, hasHarvest): # select only a subset of the workflows - years = ['2021','2023','2024','2025','2026'] + years = ['2021','2023','2024','2025','Run4'] fragments = ["TTbar_14","ZMM_14","ZEE_14","ZTT_14","NuGun","SingleMu","QCD_Pt15To7000_Flat"] selected = [ (any(y in key for y in years) and ('FS' not in key) and any( f in fragment for f in fragments)), @@ -1848,7 +1848,7 @@ def setupPU_(self, step, stepName, stepDict, k, properties): stepDict[stepName][k].pop('--pileup', None) stepDict[stepName][k].pop('--pileup_input', None) def condition(self, fragment, stepList, key, hasHarvest): - years = ['2021','2023','2024','2025','2026'] + years = ['2021','2023','2024','2025','Run4'] return fragment=="TTbar_14TeV" and any(y in key for y in years) upgradeWFs['ProdLike'] = UpgradeWorkflow_ProdLike( steps = [ @@ -1923,7 +1923,7 @@ def setupPU_(self, step, stepName, stepDict, k, properties): stepDict[stepName][k]['--pileup'] = 'AVE_' + str(self.__fixedPU) + '_BX_25ns' def condition(self, fragment, stepList, key, hasHarvest): # lower PUs for Run3 - return (fragment=="TTbar_14TeV") and (('2026' in key) or ('2021' in key and self.__fixedPU<=100)) + return (fragment=="TTbar_14TeV") and (('Run4' in key) or ('2021' in key and self.__fixedPU<=100)) # The numbering below is following the 0.21 for ProdLike wfs # 0.21N would have been a more natural choice but the @@ -2035,7 +2035,7 @@ def setup_(self, step, stepName, stepDict, k, properties): else: stepDict[stepName][k] = merge([stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return fragment=="TTbar_14TeV" and '2026' in key + return fragment=="TTbar_14TeV" and 'Run4' in key upgradeWFs['HLTTiming75e33'] = UpgradeWorkflow_HLT75e33Timing( steps = [ 'Reco', @@ -2082,9 +2082,9 @@ def condition(self, fragment, stepList, key, hasHarvest): class UpgradeWorkflow_HLTwDIGI75e33(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): if 'DigiTrigger' in step: - stepDict[stepName][k] = merge([{'-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,DIGI2RAW,HLT:@relval2026'}, stepDict[step][k]]) + stepDict[stepName][k] = merge([{'-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,DIGI2RAW,HLT:@relvalRun4'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return fragment=="TTbar_14TeV" and '2026' in key + return fragment=="TTbar_14TeV" and 'Run4' in key upgradeWFs['HLTwDIGI75e33'] = UpgradeWorkflow_HLTwDIGI75e33( steps = [ 'DigiTrigger', @@ -2099,9 +2099,9 @@ def condition(self, fragment, stepList, key, hasHarvest): class UpgradeWorkflow_L1Complete(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): if 'Digi' in step and 'NoHLT' not in step: - stepDict[stepName][k] = merge([{'-s': 'DIGI:pdigi_valid,L1,L1TrackTrigger,L1P2GT,DIGI2RAW,HLT:@relval2026'}, stepDict[step][k]]) + stepDict[stepName][k] = merge([{'-s': 'DIGI:pdigi_valid,L1,L1TrackTrigger,L1P2GT,DIGI2RAW,HLT:@relvalRun4'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return '2026' in key + return 'Run4' in key upgradeWFs['L1Complete'] = UpgradeWorkflow_L1Complete( steps = [ @@ -2143,7 +2143,7 @@ def condition(self, fragment, stepList, key, hasHarvest): offset = 0.12, ) # add some extra info -upgradeWFs['Neutron'].neutronKeys = [x for x in upgradeKeys[2026] if 'PU' not in x] +upgradeWFs['Neutron'].neutronKeys = [x for x in upgradeKeys['Run4'] if 'PU' not in x] upgradeWFs['Neutron'].neutronFrags = ['ZMM_14','MinBias_14TeV'] class UpgradeWorkflow_heCollapse(UpgradeWorkflow): @@ -2214,7 +2214,7 @@ def setup_(self, step, stepName, stepDict, k, properties): stepDict[stepName][k] = None def condition(self, fragment, stepList, key, hasHarvest): - return fragment=="TTbar_14TeV" and '2026' in key + return fragment=="TTbar_14TeV" and 'Run4' in key # ECAL Phase 2 workflow running on CPU upgradeWFs['ecalDevel'] = UpgradeWorkflow_ecalDevel( @@ -2281,7 +2281,7 @@ def setup_(self, step, stepName, stepDict, k, properties): stepDict[stepName][k] = None def condition(self, fragment, stepList, key, hasHarvest): - return fragment=="TTbar_14TeV" and ('2021' in key or '2023' in key or '2026' in key) + return fragment=="TTbar_14TeV" and ('2021' in key or '2023' in key or 'Run4' in key) upgradeWFs['ECALComponent'] = UpgradeWorkflow_ECalComponent( suffix = '_ecalComponent', @@ -2426,7 +2426,7 @@ def setup_(self, step, stepName, stepDict, k, properties): if 'Digi' in step or 'Reco' in step: stepDict[stepName][k] = merge([{'--customise': 'SLHCUpgradeSimulations/Configuration/aging.customise_aging_'+self.lumi}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return '2026' in key + return 'Run4' in key # define several of them upgradeWFs['Aging1000'] = UpgradeWorkflowAging( steps = [ @@ -2458,7 +2458,7 @@ class UpgradeWorkflow_PixelClusterSplitting(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): stepDict[stepName][k] = merge([{'--procModifiers': 'splitClustersInPhase2Pixel'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return '2026' in key + return 'Run4' in key upgradeWFs['PixelClusterSplitting'] = UpgradeWorkflow_PixelClusterSplitting( steps = [ @@ -2481,7 +2481,7 @@ class UpgradeWorkflow_JetCore(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): stepDict[stepName][k] = merge([{'--procModifiers': 'splitClustersInPhase2Pixel,jetCoreInPhase2'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return '2026' in key + return 'Run4' in key upgradeWFs['JetCore'] = UpgradeWorkflow_JetCore( steps = [ @@ -2509,7 +2509,7 @@ def setup_(self, step, stepName, stepDict, k, properties): if 'Digi' in step: stepDict[stepName][k] = merge([{'--customise': 'SimTracker/SiPhase2Digitizer/customizeForOTInefficiency.customizeSiPhase2OTInefficiency'+self.percent+'Percent'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return fragment=="TTbar_14TeV" and '2026' in key + return fragment=="TTbar_14TeV" and 'Run4' in key # define several of them upgradeWFs['OTInefficiency'] = UpgradeWorkflow_OTInefficiency( steps = [ @@ -2551,7 +2551,7 @@ def setup_(self, step, stepName, stepDict, k, properties): if 'Digi' in step: stepDict[stepName][k] = merge([{'--customise': 'SimTracker/SiPhase2Digitizer/customizeForPhase2TrackerSignalShape.customizeSiPhase2ITSignalShape'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return '2026' in key + return 'Run4' in key # define several of them upgradeWFs['ITSignalShape'] = UpgradeWorkflow_ITSignalShape( steps = [ @@ -2683,7 +2683,7 @@ def setupPU_(self, step, stepName, stepDict, k, properties): def condition(self, fragment, stepList, key, hasHarvest): if not 'PU' in key: return False - if not any(y in key for y in ['2021', '2023', '2024', '2025', '2026']): + if not any(y in key for y in ['2021', '2023', '2024', '2025', 'Run4']): return False if self.suffix.endswith("S1"): return "NuGun" in fragment @@ -2757,7 +2757,7 @@ def setupPU_(self, step, stepName, stepDict, k, properties): super(UpgradeWorkflowAdjustPU,self).setupPU_(step, stepName, stepDict, k, properties) def condition(self, fragment, stepList, key, hasHarvest): # restrict to phase2 - return super(UpgradeWorkflowAdjustPU,self).condition(fragment, stepList, key, hasHarvest) and '2026' in key + return super(UpgradeWorkflowAdjustPU,self).condition(fragment, stepList, key, hasHarvest) and 'Run4' in key upgradeWFs['PMXS1S2PR'] = UpgradeWorkflowAdjustPU( steps = [], PU = [ @@ -2909,7 +2909,7 @@ def setup_(self, step, stepName, stepDict, k, properties): dd4hepGeom+=stepDict[step][k]['--geometry'] stepDict[stepName][k] = merge([{'--geometry' : dd4hepGeom, '--procModifiers': 'dd4hep'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return ('2026' in key) and ('FS' not in key) + return ('Run4' in key) and ('FS' not in key) upgradeWFs['DD4hep'] = UpgradeWorkflow_DD4hep( steps = [ 'GenSim', @@ -3010,7 +3010,7 @@ def setup_(self, step, stepName, stepDict, k, properties): stepDict[stepName][k] = merge([{'--procModifiers': 'allSonicTriton'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): return ((fragment=='TTbar_13' or fragment=='TTbar_14TeV') and '2021' in key) \ - or (fragment=='TTbar_14TeV' and '2026' in key) + or (fragment=='TTbar_14TeV' and 'Run4' in key) upgradeWFs['SonicTriton'] = UpgradeWorkflow_SonicTriton( steps = [ 'GenSim', @@ -3060,7 +3060,7 @@ def setup_(self, step, stepName, stepDict, k, properties): elif 'Digi' in step: stepDict[stepName][k] = merge([{'-s': stepDict[step][k]["-s"].replace("DIGI:pdigi_valid","DIGI:pdigi_hi"), '--pileup': 'HiMixNoPU'}, stepDict[stepName][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return fragment=='HydjetQMinBias_5519GeV' and '2026' in key and 'PU' not in key + return fragment=='HydjetQMinBias_5519GeV' and 'Run4' in key and 'PU' not in key upgradeWFs['Phase2_HeavyIon'] = UpgradeWorkflow_Phase2_HeavyIon( steps = [ @@ -3289,207 +3289,207 @@ def condition(self, fragment, stepList, key, hasHarvest): else: upgradeProperties[2017][key+'PU']['ScenToRun'] = ['Gen','FastSimRun3PU','HARVESTFastRun3PU'] -upgradeProperties[2026] = { - '2026D86' : { - 'Geom' : 'Extended2026D86', +upgradeProperties['Run4'] = { + 'Run4D86' : { + 'Geom' : 'ExtendedRun4D86', 'HLTmenu': '@fake2', 'GT' : 'auto:phase2_realistic_T21', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D88' : { - 'Geom' : 'Extended2026D88', - 'HLTmenu': '@relval2026', + 'Run4D88' : { + 'Geom' : 'ExtendedRun4D88', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T21', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D91' : { - 'Geom' : 'Extended2026D91', + 'Run4D91' : { + 'Geom' : 'ExtendedRun4D91', 'HLTmenu': '@fake2', 'GT' : 'auto:phase2_realistic_T30', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D92' : { - 'Geom' : 'Extended2026D92', + 'Run4D92' : { + 'Geom' : 'ExtendedRun4D92', 'HLTmenu': '@fake2', 'GT' : 'auto:phase2_realistic_T21', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D93' : { - 'Geom' : 'Extended2026D93', + 'Run4D93' : { + 'Geom' : 'ExtendedRun4D93', 'HLTmenu': '@fake2', 'GT' : 'auto:phase2_realistic_T21', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D94' : { - 'Geom' : 'Extended2026D94', + 'Run4D94' : { + 'Geom' : 'ExtendedRun4D94', 'HLTmenu': '@fake2', 'GT' : 'auto:phase2_realistic_T21', 'Era' : 'Phase2C20I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D95' : { - 'Geom' : 'Extended2026D95', - 'HLTmenu': '@relval2026', + 'Run4D95' : { + 'Geom' : 'ExtendedRun4D95', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T21', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D96' : { - 'Geom' : 'Extended2026D96', + 'Run4D96' : { + 'Geom' : 'ExtendedRun4D96', 'HLTmenu': '@fake2', 'GT' : 'auto:phase2_realistic_T21', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D97' : { - 'Geom' : 'Extended2026D97', + 'Run4D97' : { + 'Geom' : 'ExtendedRun4D97', 'HLTmenu': '@fake2', 'GT' : 'auto:phase2_realistic_T25', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D98' : { - 'Geom' : 'Extended2026D98', - 'HLTmenu': '@relval2026', + 'Run4D98' : { + 'Geom' : 'ExtendedRun4D98', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T25', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D99' : { - 'Geom' : 'Extended2026D99', - 'HLTmenu': '@relval2026', + 'Run4D99' : { + 'Geom' : 'ExtendedRun4D99', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T25', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D100' : { - 'Geom' : 'Extended2026D100', - 'HLTmenu': '@relval2026', + 'Run4D100' : { + 'Geom' : 'ExtendedRun4D100', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T25', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D101' : { - 'Geom' : 'Extended2026D101', - 'HLTmenu': '@relval2026', + 'Run4D101' : { + 'Geom' : 'ExtendedRun4D101', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T25', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D102' : { - 'Geom' : 'Extended2026D102', - 'HLTmenu': '@relval2026', + 'Run4D102' : { + 'Geom' : 'ExtendedRun4D102', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T33', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D103' : { - 'Geom' : 'Extended2026D103', - 'HLTmenu': '@relval2026', + 'Run4D103' : { + 'Geom' : 'ExtendedRun4D103', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T25', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D104' : { - 'Geom' : 'Extended2026D104', - 'HLTmenu': '@relval2026', + 'Run4D104' : { + 'Geom' : 'ExtendedRun4D104', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T33', 'Era' : 'Phase2C22I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D105' : { - 'Geom' : 'Extended2026D105', - 'HLTmenu': '@relval2026', + 'Run4D105' : { + 'Geom' : 'ExtendedRun4D105', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T33', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D106' : { - 'Geom' : 'Extended2026D106', - 'HLTmenu': '@relval2026', + 'Run4D106' : { + 'Geom' : 'ExtendedRun4D106', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T33', 'Era' : 'Phase2C22I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D107' : { - 'Geom' : 'Extended2026D107', - 'HLTmenu': '@relval2026', + 'Run4D107' : { + 'Geom' : 'ExtendedRun4D107', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T25', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D108' : { - 'Geom' : 'Extended2026D108', - 'HLTmenu': '@relval2026', + 'Run4D108' : { + 'Geom' : 'ExtendedRun4D108', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T33', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D109' : { - 'Geom' : 'Extended2026D109', - 'HLTmenu': '@relval2026', + 'Run4D109' : { + 'Geom' : 'ExtendedRun4D109', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T33', 'Era' : 'Phase2C22I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D110' : { - 'Geom' : 'Extended2026D110', - 'HLTmenu': '@relval2026', + 'Run4D110' : { + 'Geom' : 'ExtendedRun4D110', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T33', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D111' : { - 'Geom' : 'Extended2026D111', - 'HLTmenu': '@relval2026', + 'Run4D111' : { + 'Geom' : 'ExtendedRun4D111', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T36', 'Era' : 'Phase2C22I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D112' : { - 'Geom' : 'Extended2026D112', - 'HLTmenu': '@relval2026', + 'Run4D112' : { + 'Geom' : 'ExtendedRun4D112', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T37', 'Era' : 'Phase2C22I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D113' : { - 'Geom' : 'Extended2026D113', - 'HLTmenu': '@relval2026', + 'Run4D113' : { + 'Geom' : 'ExtendedRun4D113', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T38', 'Era' : 'Phase2C22I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D114' : { - 'Geom' : 'Extended2026D114', - 'HLTmenu': '@relval2026', + 'Run4D114' : { + 'Geom' : 'ExtendedRun4D114', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T33', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D110GenOnly' : { - 'Geom' : 'Extended2026D110', + 'Run4D110GenOnly' : { + 'Geom' : 'ExtendedRun4D110', 'BeamSpot' : 'DBrealisticHLLHC', 'GT' : 'auto:phase2_realistic_T33', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenHLBeamSpot'], }, - '2026D110SimOnGen' : { - 'Geom' : 'Extended2026D110', - 'HLTmenu': '@relval2026', + 'Run4D110SimOnGen' : { + 'Geom' : 'ExtendedRun4D110', + 'HLTmenu': '@relvalRun4', 'BeamSpot' : 'DBrealisticHLLHC', 'GT' : 'auto:phase2_realistic_T33', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenHLBeamSpot','Sim','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, - '2026D115' : { - 'Geom' : 'Extended2026D115', - 'HLTmenu': '@relval2026', + 'Run4D115' : { + 'Geom' : 'ExtendedRun4D115', + 'HLTmenu': '@relvalRun4', 'GT' : 'auto:phase2_realistic_T33', 'Era' : 'Phase2C20I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], @@ -3497,9 +3497,9 @@ def condition(self, fragment, stepList, key, hasHarvest): } # standard PU sequences -for key in list(upgradeProperties[2026].keys()): - upgradeProperties[2026][key+'PU'] = deepcopy(upgradeProperties[2026][key]) - upgradeProperties[2026][key+'PU']['ScenToRun'] = ['GenSimHLBeamSpot','DigiTriggerPU','RecoGlobalPU', 'HARVESTGlobalPU'] +for key in list(upgradeProperties['Run4'].keys()): + upgradeProperties['Run4'][key+'PU'] = deepcopy(upgradeProperties['Run4'][key]) + upgradeProperties['Run4'][key+'PU']['ScenToRun'] = ['GenSimHLBeamSpot','DigiTriggerPU','RecoGlobalPU', 'HARVESTGlobalPU'] # for relvals defaultDataSets = {} diff --git a/Configuration/PyReleaseValidation/scripts/README.md b/Configuration/PyReleaseValidation/scripts/README.md index ec30d300fe6af..829b8f1288e59 100644 --- a/Configuration/PyReleaseValidation/scripts/README.md +++ b/Configuration/PyReleaseValidation/scripts/README.md @@ -61,35 +61,35 @@ Found 0 compatible workflows inside relval_generator Found 0 compatible workflows inside relval_standard Found 0 compatible workflows inside relval_extendedgen Found 0 compatible workflows inside relval_premix -Found 0 compatible workflows inside relval_2026 +Found 0 compatible workflows inside relval_Run4 Found 0 compatible workflows inside relval_machine Found 0 compatible workflows inside relval_pileup Found 0 compatible workflows inside relval_2017 -23201.0 SingleElectronPt10 2026D49+SingleElectronPt10_pythia8_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal -23202.0 SingleElectronPt35 2026D49+SingleElectronPt35_pythia8_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal -23203.0 SingleElectronPt1000 2026D49+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal -23291.0 SingleElectronPt15Eta1p7_2p7 2026D49+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal -23302.0 SingleEFlatPt2To100 2026D49+SingleElectronFlatPt2To100_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal -23401.0 SingleElectronPt10 2026D49PU+SingleElectronPt10_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23401.98 SingleElectronPt10 2026D49PU_PMXS2+SingleElectronPt10_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23401.99 SingleElectronPt10 2026D49PU_PMXS1S2+SingleElectronPt10_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23401.999 SingleElectronPt10 2026D49PU_PMXS1S2PR+SingleElectronPt10_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23402.0 SingleElectronPt35 2026D49PU+SingleElectronPt35_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23402.98 SingleElectronPt35 2026D49PU_PMXS2+SingleElectronPt35_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23402.99 SingleElectronPt35 2026D49PU_PMXS1S2+SingleElectronPt35_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23402.999 SingleElectronPt35 2026D49PU_PMXS1S2PR+SingleElectronPt35_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23403.0 SingleElectronPt1000 2026D49PU+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23403.98 SingleElectronPt1000 2026D49PU_PMXS2+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23403.99 SingleElectronPt1000 2026D49PU_PMXS1S2+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23403.999 SingleElectronPt1000 2026D49PU_PMXS1S2PR+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23491.0 SingleElectronPt15Eta1p7_2p7 2026D49PU+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23491.98 SingleElectronPt15Eta1p7_2p7 2026D49PU_PMXS2+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23491.99 SingleElectronPt15Eta1p7_2p7 2026D49PU_PMXS1S2+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23491.999 SingleElectronPt15Eta1p7_2p7 2026D49PU_PMXS1S2PR+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23502.0 SingleEFlatPt2To100 2026D49PU+SingleElectronFlatPt2To100_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23502.98 SingleEFlatPt2To100 2026D49PU_PMXS2+SingleElectronFlatPt2To100_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23502.99 SingleEFlatPt2To100 2026D49PU_PMXS1S2+SingleElectronFlatPt2To100_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23502.999 SingleEFlatPt2To100 2026D49PU_PMXS1S2PR+SingleElectronFlatPt2To100_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23201.0 SingleElectronPt10 Run4D49+SingleElectronPt10_pythia8_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal +23202.0 SingleElectronPt35 Run4D49+SingleElectronPt35_pythia8_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal +23203.0 SingleElectronPt1000 Run4D49+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal +23291.0 SingleElectronPt15Eta1p7_2p7 Run4D49+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal +23302.0 SingleEFlatPt2To100 Run4D49+SingleElectronFlatPt2To100_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal +23401.0 SingleElectronPt10 Run4D49PU+SingleElectronPt10_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23401.98 SingleElectronPt10 Run4D49PU_PMXS2+SingleElectronPt10_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23401.99 SingleElectronPt10 Run4D49PU_PMXS1S2+SingleElectronPt10_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23401.999 SingleElectronPt10 Run4D49PU_PMXS1S2PR+SingleElectronPt10_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23402.0 SingleElectronPt35 Run4D49PU+SingleElectronPt35_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23402.98 SingleElectronPt35 Run4D49PU_PMXS2+SingleElectronPt35_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23402.99 SingleElectronPt35 Run4D49PU_PMXS1S2+SingleElectronPt35_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23402.999 SingleElectronPt35 Run4D49PU_PMXS1S2PR+SingleElectronPt35_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23403.0 SingleElectronPt1000 Run4D49PU+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23403.98 SingleElectronPt1000 Run4D49PU_PMXS2+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23403.99 SingleElectronPt1000 Run4D49PU_PMXS1S2+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23403.999 SingleElectronPt1000 Run4D49PU_PMXS1S2PR+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23491.0 SingleElectronPt15Eta1p7_2p7 Run4D49PU+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23491.98 SingleElectronPt15Eta1p7_2p7 Run4D49PU_PMXS2+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23491.99 SingleElectronPt15Eta1p7_2p7 Run4D49PU_PMXS1S2+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23491.999 SingleElectronPt15Eta1p7_2p7 Run4D49PU_PMXS1S2PR+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23502.0 SingleEFlatPt2To100 Run4D49PU+SingleElectronFlatPt2To100_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23502.98 SingleEFlatPt2To100 Run4D49PU_PMXS2+SingleElectronFlatPt2To100_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23502.99 SingleEFlatPt2To100 Run4D49PU_PMXS1S2+SingleElectronFlatPt2To100_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23502.999 SingleEFlatPt2To100 Run4D49PU_PMXS1S2PR+SingleElectronFlatPt2To100_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU Found 25 compatible workflows inside relval_upgrade matrix> ``` @@ -116,31 +116,31 @@ Example: ``` matrix> searchInWorkflow relval_upgrade .*D49.*SingleElectron.* -23201.0 SingleElectronPt10 2026D49+SingleElectronPt10_pythia8_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal -23202.0 SingleElectronPt35 2026D49+SingleElectronPt35_pythia8_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal -23203.0 SingleElectronPt1000 2026D49+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal -23291.0 SingleElectronPt15Eta1p7_2p7 2026D49+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal -23302.0 SingleEFlatPt2To100 2026D49+SingleElectronFlatPt2To100_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal -23401.0 SingleElectronPt10 2026D49PU+SingleElectronPt10_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23401.98 SingleElectronPt10 2026D49PU_PMXS2+SingleElectronPt10_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23401.99 SingleElectronPt10 2026D49PU_PMXS1S2+SingleElectronPt10_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23401.999 SingleElectronPt10 2026D49PU_PMXS1S2PR+SingleElectronPt10_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23402.0 SingleElectronPt35 2026D49PU+SingleElectronPt35_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23402.98 SingleElectronPt35 2026D49PU_PMXS2+SingleElectronPt35_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23402.99 SingleElectronPt35 2026D49PU_PMXS1S2+SingleElectronPt35_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23402.999 SingleElectronPt35 2026D49PU_PMXS1S2PR+SingleElectronPt35_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23403.0 SingleElectronPt1000 2026D49PU+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23403.98 SingleElectronPt1000 2026D49PU_PMXS2+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23403.99 SingleElectronPt1000 2026D49PU_PMXS1S2+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23403.999 SingleElectronPt1000 2026D49PU_PMXS1S2PR+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23491.0 SingleElectronPt15Eta1p7_2p7 2026D49PU+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23491.98 SingleElectronPt15Eta1p7_2p7 2026D49PU_PMXS2+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23491.99 SingleElectronPt15Eta1p7_2p7 2026D49PU_PMXS1S2+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23491.999 SingleElectronPt15Eta1p7_2p7 2026D49PU_PMXS1S2PR+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23502.0 SingleEFlatPt2To100 2026D49PU+SingleElectronFlatPt2To100_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23502.98 SingleEFlatPt2To100 2026D49PU_PMXS2+SingleElectronFlatPt2To100_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23502.99 SingleEFlatPt2To100 2026D49PU_PMXS1S2+SingleElectronFlatPt2To100_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU -23502.999 SingleEFlatPt2To100 2026D49PU_PMXS1S2PR+SingleElectronFlatPt2To100_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23201.0 SingleElectronPt10 Run4D49+SingleElectronPt10_pythia8_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal +23202.0 SingleElectronPt35 Run4D49+SingleElectronPt35_pythia8_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal +23203.0 SingleElectronPt1000 Run4D49+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal +23291.0 SingleElectronPt15Eta1p7_2p7 Run4D49+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal +23302.0 SingleEFlatPt2To100 Run4D49+SingleElectronFlatPt2To100_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal +23401.0 SingleElectronPt10 Run4D49PU+SingleElectronPt10_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23401.98 SingleElectronPt10 Run4D49PU_PMXS2+SingleElectronPt10_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23401.99 SingleElectronPt10 Run4D49PU_PMXS1S2+SingleElectronPt10_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23401.999 SingleElectronPt10 Run4D49PU_PMXS1S2PR+SingleElectronPt10_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23402.0 SingleElectronPt35 Run4D49PU+SingleElectronPt35_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23402.98 SingleElectronPt35 Run4D49PU_PMXS2+SingleElectronPt35_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23402.99 SingleElectronPt35 Run4D49PU_PMXS1S2+SingleElectronPt35_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23402.999 SingleElectronPt35 Run4D49PU_PMXS1S2PR+SingleElectronPt35_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23403.0 SingleElectronPt1000 Run4D49PU+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23403.98 SingleElectronPt1000 Run4D49PU_PMXS2+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23403.99 SingleElectronPt1000 Run4D49PU_PMXS1S2+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23403.999 SingleElectronPt1000 Run4D49PU_PMXS1S2PR+SingleElectronPt1000_pythia8_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23491.0 SingleElectronPt15Eta1p7_2p7 Run4D49PU+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23491.98 SingleElectronPt15Eta1p7_2p7 Run4D49PU_PMXS2+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23491.99 SingleElectronPt15Eta1p7_2p7 Run4D49PU_PMXS1S2+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23491.999 SingleElectronPt15Eta1p7_2p7 Run4D49PU_PMXS1S2PR+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23502.0 SingleEFlatPt2To100 Run4D49PU+SingleElectronFlatPt2To100_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23502.98 SingleEFlatPt2To100 Run4D49PU_PMXS2+SingleElectronFlatPt2To100_GenSimHLBeamSpot+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23502.99 SingleEFlatPt2To100 Run4D49PU_PMXS1S2+SingleElectronFlatPt2To100_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU +23502.999 SingleEFlatPt2To100 Run4D49PU_PMXS1S2PR+SingleElectronFlatPt2To100_GenSimHLBeamSpot+PREMIX_PremixHLBeamSpotPU+DigiTriggerPU+RecoGlobalPU+HARVESTGlobalPU Found 25 compatible workflows inside relval_upgrade matrix> ``` @@ -152,14 +152,14 @@ Suppose now that you want to know what are the commands run by the workflow ``` matrix> dumpWorkflowId 23291 -23291.0 2026D49+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal -[1]: cmsDriver.py SingleElectronPt15Eta1p7_2p7_cfi --conditions auto:phase2_realistic_T15 -n 10 --era Phase2C9 --eventcontent FEVTDEBUG --relval 9000,100 -s GEN,SIM --datatier GEN-SIM --beamspot HLLHC --geometry Extended2026D49 +23291.0 Run4D49+SingleElectronPt15Eta1p7_2p7_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal +[1]: cmsDriver.py SingleElectronPt15Eta1p7_2p7_cfi --conditions auto:phase2_realistic_T15 -n 10 --era Phase2C9 --eventcontent FEVTDEBUG --relval 9000,100 -s GEN,SIM --datatier GEN-SIM --beamspot HLLHC --geometry ExtendedRun4D49 -[2]: cmsDriver.py step2 --conditions auto:phase2_realistic_T15 -s DIGI:pdigi_valid,L1TrackTrigger,L1,DIGI2RAW,HLT:@fake2 --datatier GEN-SIM-DIGI-RAW -n 10 --geometry Extended2026D49 --era Phase2C9 --eventcontent FEVTDEBUGHLT +[2]: cmsDriver.py step2 --conditions auto:phase2_realistic_T15 -s DIGI:pdigi_valid,L1TrackTrigger,L1,DIGI2RAW,HLT:@fake2 --datatier GEN-SIM-DIGI-RAW -n 10 --geometry ExtendedRun4D49 --era Phase2C9 --eventcontent FEVTDEBUGHLT -[3]: cmsDriver.py step3 --conditions auto:phase2_realistic_T15 -s RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@phase2Validation+@miniAODValidation,DQM:@phase2+@miniAODDQM --datatier GEN-SIM-RECO,MINIAODSIM,DQMIO -n 10 --geometry Extended2026D49 --era Phase2C9 --eventcontent FEVTDEBUGHLT,MINIAODSIM,DQM +[3]: cmsDriver.py step3 --conditions auto:phase2_realistic_T15 -s RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@phase2Validation+@miniAODValidation,DQM:@phase2+@miniAODDQM --datatier GEN-SIM-RECO,MINIAODSIM,DQMIO -n 10 --geometry ExtendedRun4D49 --era Phase2C9 --eventcontent FEVTDEBUGHLT,MINIAODSIM,DQM -[4]: cmsDriver.py step4 --conditions auto:phase2_realistic_T15 -s HARVESTING:@phase2Validation+@phase2+@miniAODValidation+@miniAODDQM --scenario pp --filetype DQM --geometry Extended2026D49 --era Phase2C9 --mc -n 100 +[4]: cmsDriver.py step4 --conditions auto:phase2_realistic_T15 -s HARVESTING:@phase2Validation+@phase2+@miniAODValidation+@miniAODDQM --scenario pp --filetype DQM --geometry ExtendedRun4D49 --era Phase2C9 --mc -n 100 Workflow found in relval_upgrade. @@ -220,7 +220,7 @@ upgrade cleanedupgrade gpu 2017 -2026 +Run4 identity machine premix @@ -333,12 +333,12 @@ MC workflows for pp collisions: | | | | | | | **Phase2** | | | | **Geometry** | | | | | | | -| 24834.0 | RelValTTbar_14TeV | phase2_realistic_T25 | Phase2C17I13M9 | Extended2026D98 | (Phase-2 baseline) -| 24834.911 | TTbar_14TeV_TuneCP5 | phase2_realistic_T25 | Phase2C17I13M9 | DD4hepExtended2026D98 | DD4Hep (HLLHC14TeV BeamSpot) -| 25034.999 | RelValTTbar_14TeV (PREMIX) | phase2_realistic_T25 | Phase2C17I13M9 | Extended2026D98 | AVE_50_BX_25ns_m3p3 -| 24896.0 | RelValCloseByPGun_CE_E_Front_120um | phase2_realistic_T25 | Phase2C17I13M9 | Extended2026D98 | -| 24900.0 | RelValCloseByPGun_CE_H_Coarse_Scint | phase2_realistic_T25 | Phase2C17I13M9 | Extended2026D98 | -| 23234.0 | TTbar_14TeV_TuneCP5 | phase2_realistic_T21 | Phase2C20I13M9 | Extended2026D94 | (exercise with HFNose) +| 24834.0 | RelValTTbar_14TeV | phase2_realistic_T25 | Phase2C17I13M9 | ExtendedRun4D98 | (Phase-2 baseline) +| 24834.911 | TTbar_14TeV_TuneCP5 | phase2_realistic_T25 | Phase2C17I13M9 | DD4hepExtendedRun4D98 | DD4Hep (HLLHC14TeV BeamSpot) +| 25034.999 | RelValTTbar_14TeV (PREMIX) | phase2_realistic_T25 | Phase2C17I13M9 | ExtendedRun4D98 | AVE_50_BX_25ns_m3p3 +| 24896.0 | RelValCloseByPGun_CE_E_Front_120um | phase2_realistic_T25 | Phase2C17I13M9 | ExtendedRun4D98 | +| 24900.0 | RelValCloseByPGun_CE_H_Coarse_Scint | phase2_realistic_T25 | Phase2C17I13M9 | ExtendedRun4D98 | +| 23234.0 | TTbar_14TeV_TuneCP5 | phase2_realistic_T21 | Phase2C20I13M9 | ExtendedRun4D94 | (exercise with HFNose) pp Data reRECO workflows: diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index f660416be7276..1f771c621b5c2 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -91,14 +91,14 @@ def runSelected(opt): 2500.201, # RelValTTbar_14TeV NanoAOD from existing MINI # Phase2 - 29634.0, # RelValTTbar_14TeV phase2_realistic_T33 Extended2026D110 (Phase-2 baseline) + 29634.0, # RelValTTbar_14TeV phase2_realistic_T33 ExtendedRun4D110 (Phase-2 baseline) 24834.911, # Previous DD4hep baseline for monitoring the stability of DD4hep workflow - 29634.911, # TTbar_14TeV_TuneCP5 phase2_realistic_T33 DD4hepExtended2026D110 DD4Hep (HLLHC14TeV BeamSpot) - 29834.999, # RelValTTbar_14TeV (PREMIX) phase2_realistic_T33 Extended2026D110 AVE_50_BX_25ns_m3p3 - 29696.0, # RelValCloseByPGun_CE_E_Front_120um phase2_realistic_T33 Extended2026D110 - 29700.0, # RelValCloseByPGun_CE_H_Coarse_Scint phase2_realistic_T33 Extended2026D110 + 29634.911, # TTbar_14TeV_TuneCP5 phase2_realistic_T33 DD4hepExtendedRun4D110 DD4Hep (HLLHC14TeV BeamSpot) + 29834.999, # RelValTTbar_14TeV (PREMIX) phase2_realistic_T33 ExtendedRun4D110 AVE_50_BX_25ns_m3p3 + 29696.0, # RelValCloseByPGun_CE_E_Front_120um phase2_realistic_T33 ExtendedRun4D110 + 29700.0, # RelValCloseByPGun_CE_H_Coarse_Scint phase2_realistic_T33 ExtendedRun4D110 #23234.0, # Need new workflow with HFNose - 29634.75, # RelValTTbar_14TeV phase2_realistic_T33 Extended2026D110 (Phase-2 baseline - but using timing menu, and only up to step 2) + 29634.75, # RelValTTbar_14TeV phase2_realistic_T33 ExtendedRun4D110 (Phase-2 baseline - but using timing menu, and only up to step 2) ###### pp Data ## Run1 diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py index 9086ea9a354a4..2921e7eba69c6 100644 --- a/Configuration/StandardSequences/python/GeometryConf.py +++ b/Configuration/StandardSequences/python/GeometryConf.py @@ -74,44 +74,44 @@ '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', - 'Extended2026D95' : 'Extended2026D95,Extended2026D95Reco', - 'DD4hepExtended2026D95' : 'DD4hepExtended2026D95,DD4hepExtended2026D95Reco', - 'Extended2026D96' : 'Extended2026D96,Extended2026D96Reco', - 'DD4hepExtended2026D96' : 'DD4hepExtended2026D96,DD4hepExtended2026D96Reco', - 'Extended2026D98' : 'Extended2026D98,Extended2026D98Reco', - 'DD4hepExtended2026D98' : 'DD4hepExtended2026D98,DD4hepExtended2026D98Reco', - 'Extended2026D99' : 'Extended2026D99,Extended2026D99Reco', - 'DD4hepExtended2026D99' : 'DD4hepExtended2026D99,DD4hepExtended2026D99Reco', - 'Extended2026D100' : 'Extended2026D100,Extended2026D100Reco', - 'DD4hepExtended2026D100' : 'DD4hepExtended2026D100,DD4hepExtended2026D100Reco', - 'Extended2026D101' : 'Extended2026D101,Extended2026D101Reco', - 'DD4hepExtended2026D101' : 'DD4hepExtended2026D101,DD4hepExtended2026D101Reco', - 'Extended2026D102' : 'Extended2026D102,Extended2026D102Reco', - 'DD4hepExtended2026D102' : 'DD4hepExtended2026D102,DD4hepExtended2026D102Reco', - 'Extended2026D103' : 'Extended2026D103,Extended2026D103Reco', - 'DD4hepExtended2026D103' : 'DD4hepExtended2026D103,DD4hepExtended2026D103Reco', - 'Extended2026D104' : 'Extended2026D104,Extended2026D104Reco', - 'DD4hepExtended2026D104' : 'DD4hepExtended2026D104,DD4hepExtended2026D104Reco', - 'Extended2026D105' : 'Extended2026D105,Extended2026D105Reco', - 'DD4hepExtended2026D105' : 'DD4hepExtended2026D105,DD4hepExtended2026D105Reco', - 'Extended2026D106' : 'Extended2026D106,Extended2026D106Reco', - 'DD4hepExtended2026D106' : 'DD4hepExtended2026D106,DD4hepExtended2026D106Reco', - 'Extended2026D107' : 'Extended2026D107,Extended2026D107Reco', - 'DD4hepExtended2026D107' : 'DD4hepExtended2026D107,DD4hepExtended2026D107Reco', - 'Extended2026D108' : 'Extended2026D108,Extended2026D108Reco', - 'DD4hepExtended2026D108' : 'DD4hepExtended2026D108,DD4hepExtended2026D108Reco', - 'Extended2026D109' : 'Extended2026D109,Extended2026D109Reco', - 'DD4hepExtended2026D109' : 'DD4hepExtended2026D109,DD4hepExtended2026D109Reco', - 'Extended2026D110' : 'Extended2026D110,Extended2026D110Reco', - 'DD4hepExtended2026D110' : 'DD4hepExtended2026D110,DD4hepExtended2026D110Reco', - 'Extended2026D111' : 'Extended2026D111,Extended2026D111Reco', - 'DD4hepExtended2026D111' : 'DD4hepExtended2026D111,DD4hepExtended2026D111Reco', - 'Extended2026D112' : 'Extended2026D112,Extended2026D112Reco', - 'DD4hepExtended2026D112' : 'DD4hepExtended2026D112,DD4hepExtended2026D112Reco', - 'Extended2026D113' : 'Extended2026D113,Extended2026D113Reco', - 'DD4hepExtended2026D113' : 'DD4hepExtended2026D113,DD4hepExtended2026D113Reco', - 'Extended2026D114' : 'Extended2026D114,Extended2026D114Reco', - 'DD4hepExtended2026D114' : 'DD4hepExtended2026D114,DD4hepExtended2026D114Reco', - 'Extended2026D115' : 'Extended2026D115,Extended2026D115Reco', - 'DD4hepExtended2026D115' : 'DD4hepExtended2026D115,DD4hepExtended2026D115Reco', + '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', + 'DD4hepExtendedRun4D111' : 'DD4hepExtendedRun4D111,DD4hepExtendedRun4D111Reco', + 'ExtendedRun4D112' : 'ExtendedRun4D112,ExtendedRun4D112Reco', + 'DD4hepExtendedRun4D112' : 'DD4hepExtendedRun4D112,DD4hepExtendedRun4D112Reco', + 'ExtendedRun4D113' : 'ExtendedRun4D113,ExtendedRun4D113Reco', + 'DD4hepExtendedRun4D113' : 'DD4hepExtendedRun4D113,DD4hepExtendedRun4D113Reco', + 'ExtendedRun4D114' : 'ExtendedRun4D114,ExtendedRun4D114Reco', + 'DD4hepExtendedRun4D114' : 'DD4hepExtendedRun4D114,DD4hepExtendedRun4D114Reco', + 'ExtendedRun4D115' : 'ExtendedRun4D115,ExtendedRun4D115Reco', + 'DD4hepExtendedRun4D115' : 'DD4hepExtendedRun4D115,DD4hepExtendedRun4D115Reco', } diff --git a/DQM/SiTrackerPhase2/test/dqmstep_phase2tk_cfg.py b/DQM/SiTrackerPhase2/test/dqmstep_phase2tk_cfg.py index 69d1be270ad71..16609d4fc5880 100644 --- a/DQM/SiTrackerPhase2/test/dqmstep_phase2tk_cfg.py +++ b/DQM/SiTrackerPhase2/test/dqmstep_phase2tk_cfg.py @@ -16,7 +16,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D76Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D76Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.RawToDigi_Data_cff') process.load('Configuration.StandardSequences.L1Reco_cff') diff --git a/DQM/SiTrackerPhase2/test/harvestingstep_phase2tk_cfg.py b/DQM/SiTrackerPhase2/test/harvestingstep_phase2tk_cfg.py index 4991122029b5d..7a1bde4d1805f 100644 --- a/DQM/SiTrackerPhase2/test/harvestingstep_phase2tk_cfg.py +++ b/DQM/SiTrackerPhase2/test/harvestingstep_phase2tk_cfg.py @@ -15,7 +15,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D76Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D76Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.DQMSaverAtRunEnd_cff') process.load('Configuration.StandardSequences.Harvesting_cff') diff --git a/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py b/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py index 3f14f2181dca2..0fb320efd7ffa 100644 --- a/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py +++ b/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py @@ -3,9 +3,9 @@ import sys, os import FWCore.ParameterSet.VarParsing as VarParsing from FWCore.Utilities.Enumerate import Enumerate -from Configuration.Geometry.dict2026Geometry import detectorVersionDict +from Configuration.Geometry.dictRun4Geometry import detectorVersionDict -varType = Enumerate ("Run1 2015 2017 2021 2026 MaPSA") +varType = Enumerate ("Run1 2015 2017 2021 Run4 MaPSA") defaultVersion=str(); def help(): @@ -15,7 +15,7 @@ def help(): print(" ", varType.keys()) print("") print(" version=versionNumber") - print(" scenario version from 2026 dictionary") + print(" scenario version from Run4 dictionary") print("") print(" tgeo=bool") print(" dump in TGeo format to browse in geometry viewer") @@ -38,7 +38,7 @@ def help(): def versionCheck(ver): if ver == "": - print("Please, specify 2026 scenario version\n") + print("Please, specify Run4 scenario version\n") print(sorted([x[1] for x in detectorVersionDict.items()])) print("") help() @@ -75,7 +75,7 @@ def recoGeoLoad(score, properties): process.DTGeometryESModule.applyAlignment = cms.bool(False) process.CSCGeometryESModule.applyAlignment = cms.bool(False) - elif "2026" in score: + elif "Run4" in score: versionCheck(options.version) process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") @@ -83,13 +83,13 @@ def recoGeoLoad(score, properties): from Configuration.AlCa.autoCond import autoCond # Ensure autoCond is imported # Ensure options.version is defined and set correctly - version_key = '2026' + options.version # This constructs the key for accessing the properties dictionary + version_key = 'Run4' + options.version # This constructs the key for accessing the properties dictionary print(f"Constructed version key: {version_key}") - # Check if the key exists in properties for 2026 - if version_key in properties[2026]: + # Check if the key exists in properties for Run4 + if version_key in properties['Run4']: # Get the specific global tag for this version - global_tag_key = properties[2026][version_key]['GT'] + global_tag_key = properties['Run4'][version_key]['GT'] print(f"Global tag key from properties: {global_tag_key}") # Check if this key exists in autoCond @@ -100,8 +100,8 @@ def recoGeoLoad(score, properties): else: raise KeyError(f"Global tag key '{global_tag_key}' not found in autoCond.") else: - raise KeyError(f"Version key '{version_key}' not found in properties[2026].") - process.load('Configuration.Geometry.GeometryExtended2026'+options.version+'Reco_cff') + raise KeyError(f"Version key '{version_key}' not found in properties['Run4'].") + process.load('Configuration.Geometry.GeometryExtendedRun4'+options.version+'Reco_cff') process.trackerGeometry.applyAlignment = cms.bool(False) elif score == "MaPSA": @@ -150,7 +150,7 @@ def recoGeoLoad(score, properties): defaultVersion, # default value VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "info about 2026 geometry scenario version") + "info about Run4 geometry scenario version") options.register ('tgeo', False, # default value @@ -192,8 +192,8 @@ def recoGeoLoad(score, properties): from Configuration.PyReleaseValidation.upgradeWorkflowComponents import upgradeProperties as properties # Determine version_key based on the value of options.tag -if options.tag == "2026" or options.tag == "MaPSA": - prop_key = 2026 +if options.tag == "Run4" or options.tag == "MaPSA": + prop_key = 'Run4' version_key = options.tag + options.version elif options.tag == "2017" or options.tag == "2021": #(this leads to crashes in tests ?) prop_key = 2017 diff --git a/Fireworks/Geometry/test/BuildFile.xml b/Fireworks/Geometry/test/BuildFile.xml index 697b14c6e9bff..8d89746b6fea6 100644 --- a/Fireworks/Geometry/test/BuildFile.xml +++ b/Fireworks/Geometry/test/BuildFile.xml @@ -4,4 +4,4 @@ - + diff --git a/Fireworks/Geometry/test/test_dumpRecoGeometry.sh b/Fireworks/Geometry/test/test_dumpRecoGeometry.sh index 01e96e4adbcb0..02f462213e165 100755 --- a/Fireworks/Geometry/test/test_dumpRecoGeometry.sh +++ b/Fireworks/Geometry/test/test_dumpRecoGeometry.sh @@ -16,17 +16,17 @@ fi # Get the TAG from the command-line argument TAG=$1 -# Function to extract the available versions for 2026 -get_2026_versions() { - local files=($(ls ${GEOMETRY_DIR}/GeometryExtended2026D*Reco*)) +# Function to extract the available versions for Run4 +get_Run4_versions() { + local files=($(ls ${GEOMETRY_DIR}/GeometryExtendedRun4D*Reco*)) if [ ${#files[@]} -eq 0 ]; then - echo "No files found for 2026 versions." + echo "No files found for Run4 versions." exit 1 fi local versions=() for file in "${files[@]}"; do - local version=$(basename "$file" | sed -n 's/.*GeometryExtended2026D\([0-9]\{1,3\}\).*/\1/p') + local version=$(basename "$file" | sed -n 's/.*GeometryExtendedRun4D\([0-9]\{1,3\}\).*/\1/p') if [[ "$version" =~ ^[0-9]{1,3}$ ]]; then versions+=("D${version}") fi @@ -52,13 +52,13 @@ run_cmsrun() { done } -# Check if the tag is 2026 -if [ "$TAG" == "2026" ]; then - # Get all the versions for 2026 - VERSIONS=($(get_2026_versions)) +# Check if the tag is Run4 +if [ "$TAG" == "Run4" ]; then + # Get all the versions for Run4 + VERSIONS=($(get_Run4_versions)) for VERSION in "${VERSIONS[@]}"; do - echo "Running for 2026 with version $VERSION" - run_cmsrun "2026" "$VERSION" || die "Failure running dumpRecoGeometry_cfg.py tag=$TAG" $? + echo "Running for Run4 with version $VERSION" + run_cmsrun "Run4" "$VERSION" || die "Failure running dumpRecoGeometry_cfg.py tag=$TAG" $? done # Wait for all background jobs to finish diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D100.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D100.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D100.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D100.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D101.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D101.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D101.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D101.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D102.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D102.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D102.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D102.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D103.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D103.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D103.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D103.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D104.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D104.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D104.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D104.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D105.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D105.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D105.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D105.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D106.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D106.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D106.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D106.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D107.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D107.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D107.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D107.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D108.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D108.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D108.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D108.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D109.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D109.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D109.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D109.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D110.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D110.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D110.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D110.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D111.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D111.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D111.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D111.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D112.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D112.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D112.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D112.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D113.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D113.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D113.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D113.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D114.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D114.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D114.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D114.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D115.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D115.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D115.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D115.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D95.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D95.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D95.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D95.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D96.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D96.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D96.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D96.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98Calo.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98Calo.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98Calo.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98Calo.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98Muon.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98Muon.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98Muon.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98Muon.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98Tracker.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98Tracker.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98Tracker.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98Tracker.xml diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D99.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D99.xml similarity index 100% rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D99.xml rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D99.xml diff --git a/Geometry/CMSCommonData/python/GeometryDD4hepExtended2026D98CaloReco_cff.py b/Geometry/CMSCommonData/python/GeometryDD4hepExtendedRun4D98CaloReco_cff.py similarity index 96% rename from Geometry/CMSCommonData/python/GeometryDD4hepExtended2026D98CaloReco_cff.py rename to Geometry/CMSCommonData/python/GeometryDD4hepExtendedRun4D98CaloReco_cff.py index 46c02f7aecd33..40c22b69e8157 100644 --- a/Geometry/CMSCommonData/python/GeometryDD4hepExtended2026D98CaloReco_cff.py +++ b/Geometry/CMSCommonData/python/GeometryDD4hepExtendedRun4D98CaloReco_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98Calo.xml") +DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98Calo.xml") from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Geometry/CMSCommonData/python/GeometryDD4hepExtended2026D98HGCalReco_cff.py b/Geometry/CMSCommonData/python/GeometryDD4hepExtendedRun4D98HGCalReco_cff.py similarity index 92% rename from Geometry/CMSCommonData/python/GeometryDD4hepExtended2026D98HGCalReco_cff.py rename to Geometry/CMSCommonData/python/GeometryDD4hepExtendedRun4D98HGCalReco_cff.py index 2147b3301b831..59ffd6431ec53 100644 --- a/Geometry/CMSCommonData/python/GeometryDD4hepExtended2026D98HGCalReco_cff.py +++ b/Geometry/CMSCommonData/python/GeometryDD4hepExtendedRun4D98HGCalReco_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98HGCal.xml") +DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98HGCal.xml") from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * from Geometry.CaloEventSetup.HGCalTopology_cfi import * diff --git a/Geometry/CMSCommonData/python/GeometryDD4hepExtended2026D98MuonReco_cff.py b/Geometry/CMSCommonData/python/GeometryDD4hepExtendedRun4D98MuonReco_cff.py similarity index 90% rename from Geometry/CMSCommonData/python/GeometryDD4hepExtended2026D98MuonReco_cff.py rename to Geometry/CMSCommonData/python/GeometryDD4hepExtendedRun4D98MuonReco_cff.py index b60b67cada3a2..367fba1ed4c6d 100644 --- a/Geometry/CMSCommonData/python/GeometryDD4hepExtended2026D98MuonReco_cff.py +++ b/Geometry/CMSCommonData/python/GeometryDD4hepExtendedRun4D98MuonReco_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98Muon.xml") +DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98Muon.xml") from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * diff --git a/Geometry/CMSCommonData/python/GeometryDD4hepExtended2026D98TrackerReco_cff.py b/Geometry/CMSCommonData/python/GeometryDD4hepExtendedRun4D98TrackerReco_cff.py similarity index 91% rename from Geometry/CMSCommonData/python/GeometryDD4hepExtended2026D98TrackerReco_cff.py rename to Geometry/CMSCommonData/python/GeometryDD4hepExtendedRun4D98TrackerReco_cff.py index f3f37b750782d..d6bba0b9a9838 100644 --- a/Geometry/CMSCommonData/python/GeometryDD4hepExtended2026D98TrackerReco_cff.py +++ b/Geometry/CMSCommonData/python/GeometryDD4hepExtendedRun4D98TrackerReco_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D98Tracker.xml") +DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D98Tracker.xml") from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Geometry/CMSCommonData/python/GeometryExtended2026D98CaloReco_cff.py b/Geometry/CMSCommonData/python/GeometryExtendedRun4D98CaloReco_cff.py similarity index 95% rename from Geometry/CMSCommonData/python/GeometryExtended2026D98CaloReco_cff.py rename to Geometry/CMSCommonData/python/GeometryExtendedRun4D98CaloReco_cff.py index 4e0eea4b2027b..2b08b1836b1fa 100644 --- a/Geometry/CMSCommonData/python/GeometryExtended2026D98CaloReco_cff.py +++ b/Geometry/CMSCommonData/python/GeometryExtendedRun4D98CaloReco_cff.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from Geometry.CMSCommonData.cmsExtendedGeometry2026D98CaloXML_cfi import * +from Geometry.CMSCommonData.cmsExtendedGeometryRun4D98CaloXML_cfi import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Geometry/CMSCommonData/python/GeometryExtended2026D98MuonReco_cff.py b/Geometry/CMSCommonData/python/GeometryExtendedRun4D98MuonReco_cff.py similarity index 88% rename from Geometry/CMSCommonData/python/GeometryExtended2026D98MuonReco_cff.py rename to Geometry/CMSCommonData/python/GeometryExtendedRun4D98MuonReco_cff.py index db8938aab5a7c..fdc29ec67fab0 100644 --- a/Geometry/CMSCommonData/python/GeometryExtended2026D98MuonReco_cff.py +++ b/Geometry/CMSCommonData/python/GeometryExtendedRun4D98MuonReco_cff.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from Geometry.CMSCommonData.cmsExtendedGeometry2026D98MuonXML_cfi import * +from Geometry.CMSCommonData.cmsExtendedGeometryRun4D98MuonXML_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * diff --git a/Geometry/CMSCommonData/python/GeometryExtended2026D98TrackerReco_cff.py b/Geometry/CMSCommonData/python/GeometryExtendedRun4D98TrackerReco_cff.py similarity index 90% rename from Geometry/CMSCommonData/python/GeometryExtended2026D98TrackerReco_cff.py rename to Geometry/CMSCommonData/python/GeometryExtendedRun4D98TrackerReco_cff.py index 3fa6312f3b65a..fd914f6d674e0 100644 --- a/Geometry/CMSCommonData/python/GeometryExtended2026D98TrackerReco_cff.py +++ b/Geometry/CMSCommonData/python/GeometryExtendedRun4D98TrackerReco_cff.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from Geometry.CMSCommonData.cmsExtendedGeometry2026D98TrackerXML_cfi import * +from Geometry.CMSCommonData.cmsExtendedGeometryRun4D98TrackerXML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D100XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D100XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D100XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D100XML_cfi.py index aa65f91bee9f9..8b68c2538ef3c 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D100XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D100XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D101XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D101XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D101XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D101XML_cfi.py index 3d40315e97a65..5a3bcbeecb3ae 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D101XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D101XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D102XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D102XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D102XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D102XML_cfi.py index c6eaef2fe0683..945289b68c780 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D102XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D102XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D103XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D103XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D103XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D103XML_cfi.py index 9445410685ab2..80a16e30c99b3 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D103XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D103XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D104XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D104XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D104XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D104XML_cfi.py index 8939d3a16abda..22779bbcef403 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D104XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D104XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D105XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D105XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D105XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D105XML_cfi.py index 70b22e9544bd8..24a7ed1df3ee6 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D105XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D105XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D106XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D106XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D106XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D106XML_cfi.py index 17c5e7d96d802..a1d60d61f432d 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D106XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D106XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D107XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D107XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D107XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D107XML_cfi.py index df50a19406660..a93127b0874cd 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D107XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D107XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D108XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D108XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D108XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D108XML_cfi.py index 3ceccbe52de9b..6d1aa57b8bbcd 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D108XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D108XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D109XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D109XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D109XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D109XML_cfi.py index f7c0de5f5a94e..e5c8f0be32f3d 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D109XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D109XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D110XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D110XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D110XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D110XML_cfi.py index 0dd1e21b6ac38..01c06221da807 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D110XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D110XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D111XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D111XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D111XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D111XML_cfi.py index 024cd0813787e..325379e4ee11e 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D111XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D111XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D112XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D112XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D112XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D112XML_cfi.py index 0b2b88c3ddd3e..f51ad8d014d11 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D112XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D112XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D113XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D113XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D113XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D113XML_cfi.py index cf1f139dbb663..2a3b7d1a6e211 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D113XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D113XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D114XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D114XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D114XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D114XML_cfi.py index eb0db9b83a91c..8814481a55d29 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D114XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D114XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D115XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D115XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D115XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D115XML_cfi.py index 4f1b74801160a..3ff1891234d7a 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D115XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D115XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D95XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D95XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D95XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D95XML_cfi.py index f394b6efba4e9..9b4e7b5054b31 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D95XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D95XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D96XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D96XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D96XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D96XML_cfi.py index c38f0be3219ce..edd74f1ebc0fc 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D96XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D96XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D98CaloXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98CaloXML_cfi.py similarity index 100% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D98CaloXML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98CaloXML_cfi.py diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D98MuonXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98MuonXML_cfi.py similarity index 100% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D98MuonXML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98MuonXML_cfi.py diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D98TrackerXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98TrackerXML_cfi.py similarity index 100% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D98TrackerXML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98TrackerXML_cfi.py diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D98XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D98XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98XML_cfi.py index 82d3877427c82..991fba49a0d10 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D98XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D98XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D99XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D99XML_cfi.py similarity index 99% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D99XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D99XML_cfi.py index 3a49759c55ff8..e4da741654034 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D99XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D99XML_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -# This config was generated automatically using generate2026Geometry.py +# This config was generated automatically using generateRun4Geometry.py # If you notice a mistake, please update the generating script, not just this config XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D35.py b/Geometry/CMSCommonData/test/dd4hep/2026D35.py deleted file mode 100644 index 0ca47c0eb88e7..0000000000000 --- a/Geometry/CMSCommonData/test/dd4hep/2026D35.py +++ /dev/null @@ -1,32 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C4_cff import Phase2C4 - -process = cms.Process("HcalParametersTest",Phase2C4) - -process.load('Geometry.HcalCommonData.hcalParameters_cff') -process.load('Geometry.HcalCommonData.hcalSimulationParameters_cff') -process.load('FWCore.MessageService.MessageLogger_cfi') - -process.source = cms.Source("EmptySource") -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) - ) - -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D35.xml'), - appendToDataLabel = cms.string('') -) - -process.DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer", - appendToDataLabel = cms.string('') -) - -process.hpa = cms.EDAnalyzer("HcalParametersAnalyzer") -process.hcalParameters.fromDD4hep = cms.bool(True) -process.hcalSimulationParameters.fromDD4hep = cms.bool(True) - -process.Timing = cms.Service("Timing") -process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck") - -process.p1 = cms.Path(process.hpa) diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D41.py b/Geometry/CMSCommonData/test/dd4hep/2026D41.py deleted file mode 100644 index d0312c60b8703..0000000000000 --- a/Geometry/CMSCommonData/test/dd4hep/2026D41.py +++ /dev/null @@ -1,32 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C8_cff import Phase2C8 - -process = cms.Process("HcalParametersTest",Phase2C8) - -process.load('Geometry.HcalCommonData.hcalParameters_cff') -process.load('Geometry.HcalCommonData.hcalSimulationParameters_cff') -process.load('FWCore.MessageService.MessageLogger_cfi') - -process.source = cms.Source("EmptySource") -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) - ) - -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D41.xml'), - appendToDataLabel = cms.string('') -) - -process.DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer", - appendToDataLabel = cms.string('') -) - -process.hpa = cms.EDAnalyzer("HcalParametersAnalyzer") -process.hcalParameters.fromDD4hep = cms.bool(True) -process.hcalSimulationParameters.fromDD4hep = cms.bool(True) - -process.Timing = cms.Service("Timing") -process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck") - -process.p1 = cms.Path(process.hpa) diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D43.py b/Geometry/CMSCommonData/test/dd4hep/2026D43.py deleted file mode 100644 index c5f6283d35d79..0000000000000 --- a/Geometry/CMSCommonData/test/dd4hep/2026D43.py +++ /dev/null @@ -1,32 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C4_cff import Phase2C4 - -process = cms.Process("HcalParametersTest",Phase2C4) - -process.load('Geometry.HcalCommonData.hcalParameters_cff') -process.load('Geometry.HcalCommonData.hcalSimulationParameters_cff') -process.load('FWCore.MessageService.MessageLogger_cfi') - -process.source = cms.Source("EmptySource") -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) - ) - -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D43.xml'), - appendToDataLabel = cms.string('') -) - -process.DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer", - appendToDataLabel = cms.string('') -) - -process.hpa = cms.EDAnalyzer("HcalParametersAnalyzer") -process.hcalParameters.fromDD4hep = cms.bool(True) -process.hcalSimulationParameters.fromDD4hep = cms.bool(True) - -process.Timing = cms.Service("Timing") -process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck") - -process.p1 = cms.Path(process.hpa) diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D45.py b/Geometry/CMSCommonData/test/dd4hep/2026D45.py deleted file mode 100644 index 62de05a3f127f..0000000000000 --- a/Geometry/CMSCommonData/test/dd4hep/2026D45.py +++ /dev/null @@ -1,32 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C8_cff import Phase2C8 - -process = cms.Process("HcalParametersTest",Phase2C8) - -process.load('Geometry.HcalCommonData.hcalParameters_cff') -process.load('Geometry.HcalCommonData.hcalSimulationParameters_cff') -process.load('FWCore.MessageService.MessageLogger_cfi') - -process.source = cms.Source("EmptySource") -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) - ) - -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D45.xml'), - appendToDataLabel = cms.string('') -) - -process.DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer", - appendToDataLabel = cms.string('') -) - -process.hpa = cms.EDAnalyzer("HcalParametersAnalyzer") -process.hcalParameters.fromDD4hep = cms.bool(True) -process.hcalSimulationParameters.fromDD4hep = cms.bool(True) - -process.Timing = cms.Service("Timing") -process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck") - -process.p1 = cms.Path(process.hpa) diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D45NoSD.py b/Geometry/CMSCommonData/test/dd4hep/2026D45NoSD.py deleted file mode 100644 index 7d7f8e473c5c0..0000000000000 --- a/Geometry/CMSCommonData/test/dd4hep/2026D45NoSD.py +++ /dev/null @@ -1,32 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C8_cff import Phase2C8 - -process = cms.Process("HcalParametersTest",Phase2C8) - -process.load('Geometry.HcalCommonData.hcalParameters_cff') -process.load('Geometry.HcalCommonData.hcalSimulationParameters_cff') -process.load('FWCore.MessageService.MessageLogger_cfi') - -process.source = cms.Source("EmptySource") -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) - ) - -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D45NoSD.xml'), - appendToDataLabel = cms.string('') -) - -process.DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer", - appendToDataLabel = cms.string('') -) - -process.hpa = cms.EDAnalyzer("HcalParametersAnalyzer") -process.hcalParameters.fromDD4hep = cms.bool(True) -process.hcalSimulationParameters.fromDD4hep = cms.bool(True) - -process.Timing = cms.Service("Timing") -process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck") - -process.p1 = cms.Path(process.hpa) diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D46.py b/Geometry/CMSCommonData/test/dd4hep/2026D46.py deleted file mode 100644 index 8f386cbabf8c0..0000000000000 --- a/Geometry/CMSCommonData/test/dd4hep/2026D46.py +++ /dev/null @@ -1,32 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 - -process = cms.Process("HcalParametersTest",Phase2C9) - -process.load('Geometry.HcalCommonData.hcalParameters_cff') -process.load('Geometry.HcalCommonData.hcalSimulationParameters_cff') -process.load('FWCore.MessageService.MessageLogger_cfi') - -process.source = cms.Source("EmptySource") -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) - ) - -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D46.xml'), - appendToDataLabel = cms.string('') -) - -process.DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer", - appendToDataLabel = cms.string('') -) - -process.hpa = cms.EDAnalyzer("HcalParametersAnalyzer") -process.hcalParameters.fromDD4hep = cms.bool(True) -process.hcalSimulationParameters.fromDD4hep = cms.bool(True) - -process.Timing = cms.Service("Timing") -process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck") - -process.p1 = cms.Path(process.hpa) diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D47.py b/Geometry/CMSCommonData/test/dd4hep/2026D47.py deleted file mode 100644 index 7beed8ac661f8..0000000000000 --- a/Geometry/CMSCommonData/test/dd4hep/2026D47.py +++ /dev/null @@ -1,32 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C10_cff import Phase2C10 - -process = cms.Process("HcalParametersTest",Phase2C10) - -process.load('Geometry.HcalCommonData.hcalParameters_cff') -process.load('Geometry.HcalCommonData.hcalSimulationParameters_cff') -process.load('FWCore.MessageService.MessageLogger_cfi') - -process.source = cms.Source("EmptySource") -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) - ) - -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D47.xml'), - appendToDataLabel = cms.string('') -) - -process.DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer", - appendToDataLabel = cms.string('') -) - -process.hpa = cms.EDAnalyzer("HcalParametersAnalyzer") -process.hcalParameters.fromDD4hep = cms.bool(True) -process.hcalSimulationParameters.fromDD4hep = cms.bool(True) - -process.Timing = cms.Service("Timing") -process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck") - -process.p1 = cms.Path(process.hpa) diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D48.py b/Geometry/CMSCommonData/test/dd4hep/2026D48.py deleted file mode 100644 index 515e0f741302d..0000000000000 --- a/Geometry/CMSCommonData/test/dd4hep/2026D48.py +++ /dev/null @@ -1,32 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 - -process = cms.Process("HcalParametersTest",Phase2C9) - -process.load('Geometry.HcalCommonData.hcalParameters_cff') -process.load('Geometry.HcalCommonData.hcalSimulationParameters_cff') -process.load('FWCore.MessageService.MessageLogger_cfi') - -process.source = cms.Source("EmptySource") -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) - ) - -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D48.xml'), - appendToDataLabel = cms.string('') -) - -process.DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer", - appendToDataLabel = cms.string('') -) - -process.hpa = cms.EDAnalyzer("HcalParametersAnalyzer") -process.hcalParameters.fromDD4hep = cms.bool(True) -process.hcalSimulationParameters.fromDD4hep = cms.bool(True) - -process.Timing = cms.Service("Timing") -process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck") - -process.p1 = cms.Path(process.hpa) diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D49.py b/Geometry/CMSCommonData/test/dd4hep/2026D49.py deleted file mode 100644 index 5e3cdc59fd869..0000000000000 --- a/Geometry/CMSCommonData/test/dd4hep/2026D49.py +++ /dev/null @@ -1,32 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 - -process = cms.Process("HcalParametersTest",Phase2C9) - -process.load('Geometry.HcalCommonData.hcalParameters_cff') -process.load('Geometry.HcalCommonData.hcalSimulationParameters_cff') -process.load('FWCore.MessageService.MessageLogger_cfi') - -process.source = cms.Source("EmptySource") -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) - ) - -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D49.xml'), - appendToDataLabel = cms.string('') -) - -process.DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer", - appendToDataLabel = cms.string('') -) - -process.hpa = cms.EDAnalyzer("HcalParametersAnalyzer") -process.hcalParameters.fromDD4hep = cms.bool(True) -process.hcalSimulationParameters.fromDD4hep = cms.bool(True) - -process.Timing = cms.Service("Timing") -process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck") - -process.p1 = cms.Path(process.hpa) diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D50.py b/Geometry/CMSCommonData/test/dd4hep/2026D50.py deleted file mode 100644 index 52519b2c78661..0000000000000 --- a/Geometry/CMSCommonData/test/dd4hep/2026D50.py +++ /dev/null @@ -1,32 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 - -process = cms.Process("HcalParametersTest",Phase2C9) - -process.load('Geometry.HcalCommonData.hcalParameters_cff') -process.load('Geometry.HcalCommonData.hcalSimulationParameters_cff') -process.load('FWCore.MessageService.MessageLogger_cfi') - -process.source = cms.Source("EmptySource") -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) - ) - -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D50.xml'), - appendToDataLabel = cms.string('') -) - -process.DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer", - appendToDataLabel = cms.string('') -) - -process.hpa = cms.EDAnalyzer("HcalParametersAnalyzer") -process.hcalParameters.fromDD4hep = cms.bool(True) -process.hcalSimulationParameters.fromDD4hep = cms.bool(True) - -process.Timing = cms.Service("Timing") -process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck") - -process.p1 = cms.Path(process.hpa) diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D51.py b/Geometry/CMSCommonData/test/dd4hep/2026D51.py deleted file mode 100644 index e27e87df9c964..0000000000000 --- a/Geometry/CMSCommonData/test/dd4hep/2026D51.py +++ /dev/null @@ -1,32 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 - -process = cms.Process("HcalParametersTest",Phase2C9) - -process.load('Geometry.HcalCommonData.hcalParameters_cff') -process.load('Geometry.HcalCommonData.hcalSimulationParameters_cff') -process.load('FWCore.MessageService.MessageLogger_cfi') - -process.source = cms.Source("EmptySource") -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) - ) - -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D51.xml'), - appendToDataLabel = cms.string('') -) - -process.DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer", - appendToDataLabel = cms.string('') -) - -process.hpa = cms.EDAnalyzer("HcalParametersAnalyzer") -process.hcalParameters.fromDD4hep = cms.bool(True) -process.hcalSimulationParameters.fromDD4hep = cms.bool(True) - -process.Timing = cms.Service("Timing") -process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck") - -process.p1 = cms.Path(process.hpa) diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D52.py b/Geometry/CMSCommonData/test/dd4hep/2026D52.py deleted file mode 100644 index c8d01d1b1c3b1..0000000000000 --- a/Geometry/CMSCommonData/test/dd4hep/2026D52.py +++ /dev/null @@ -1,32 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 - -process = cms.Process("HcalParametersTest",Phase2C9) - -process.load('Geometry.HcalCommonData.hcalParameters_cff') -process.load('Geometry.HcalCommonData.hcalSimulationParameters_cff') -process.load('FWCore.MessageService.MessageLogger_cfi') - -process.source = cms.Source("EmptySource") -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) - ) - -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D52.xml'), - appendToDataLabel = cms.string('') -) - -process.DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer", - appendToDataLabel = cms.string('') -) - -process.hpa = cms.EDAnalyzer("HcalParametersAnalyzer") -process.hcalParameters.fromDD4hep = cms.bool(True) -process.hcalSimulationParameters.fromDD4hep = cms.bool(True) - -process.Timing = cms.Service("Timing") -process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck") - -process.p1 = cms.Path(process.hpa) diff --git a/Geometry/ForwardCommonData/test/g4OverlapCheckHFNoseDDD_cfg.py b/Geometry/ForwardCommonData/test/g4OverlapCheckHFNoseDDD_cfg.py index a8ca31d081d3d..7543367c694dd 100644 --- a/Geometry/ForwardCommonData/test/g4OverlapCheckHFNoseDDD_cfg.py +++ b/Geometry/ForwardCommonData/test/g4OverlapCheckHFNoseDDD_cfg.py @@ -31,7 +31,7 @@ from Configuration.Eras.Modifier_phase2_hfnose_cff import phase2_hfnose process = cms.Process('PROD',Phase2C17I13M9,phase2_hfnose) -geomFile = "Configuration.Geometry.GeometryExtended2026D94Reco_cff" +geomFile = "Configuration.Geometry.GeometryExtendedRun4D94Reco_cff" baseName = "cms2026D94DDD" print("Geometry file Name: ", geomFile) diff --git a/Geometry/HGCalGeometry/test/python/hgcGeomAnalyzer_cfg.py b/Geometry/HGCalGeometry/test/python/hgcGeomAnalyzer_cfg.py index ce242b91040cb..4da6c9d61f87c 100644 --- a/Geometry/HGCalGeometry/test/python/hgcGeomAnalyzer_cfg.py +++ b/Geometry/HGCalGeometry/test/python/hgcGeomAnalyzer_cfg.py @@ -22,11 +22,11 @@ process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") if options.geom == 'v16': - geomFile = 'Configuration.Geometry.GeometryExtended2026D100Reco_cff' + geomFile = 'Configuration.Geometry.GeometryExtendedRun4D100Reco_cff' elif options.geom == 'v17': - geomFile = 'Configuration.Geometry.GeometryExtended2026D110Reco_cff' + geomFile = 'Configuration.Geometry.GeometryExtendedRun4D110Reco_cff' elif options.geom == 'v18': - geomFile = 'Configuration.Geometry.GeometryExtended2026D104Reco_cff' + geomFile = 'Configuration.Geometry.GeometryExtendedRun4D104Reco_cff' else: geomFile = 'UNKNOWN GEOMETRY!' raise Exception(geomFile) diff --git a/Geometry/HGCalGeometry/test/python/runCaloCellGeometryTest_cfg.py b/Geometry/HGCalGeometry/test/python/runCaloCellGeometryTest_cfg.py index f4963a9c87caf..cd651aa7bf756 100644 --- a/Geometry/HGCalGeometry/test/python/runCaloCellGeometryTest_cfg.py +++ b/Geometry/HGCalGeometry/test/python/runCaloCellGeometryTest_cfg.py @@ -4,8 +4,8 @@ process = cms.Process("CaloCellGeometryTest",Phase2C17I13M9) -process.load("Configuration.Geometry.GeometryExtended2026D110_cff") -process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff") +process.load("Configuration.Geometry.GeometryExtendedRun4D110_cff") +process.load("Configuration.Geometry.GeometryExtendedRun4D110Reco_cff") process.load('FWCore.MessageService.MessageLogger_cfi') if hasattr(process,'MessageLogger'): diff --git a/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDD4hep_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDD4hep_cfg.py index f8354b3d3ac91..3f54fa431cb9c 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDD4hep_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDD4hep_cfg.py @@ -19,7 +19,7 @@ process.load("Geometry.HGCalGeometry.hgcalGeometryDump_cfi") process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D71.xml'), + confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D71.xml'), appendToDataLabel = cms.string('') ) diff --git a/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDDD_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDDD_cfg.py index 2d2f12b80cf3c..686253490ac40 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDDD_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDDD_cfg.py @@ -31,7 +31,7 @@ from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('PROD',Phase2C17I13M9) -geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" +geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff" print("Geometry file: ", geomFile) process.load(geomFile) diff --git a/Geometry/HGCalGeometry/test/python/testHGCalCorner_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalCorner_cfg.py index 107e83908db53..3509909ae5f1a 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalCorner_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalCorner_cfg.py @@ -29,7 +29,7 @@ #################################################################### # Use the options -geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" +geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff" print("Geometry file: ", geomFile) process.load(geomFile) diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeomLocatorSc_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeomLocatorSc_cfg.py index a015a6705ff82..ae76b176ec95d 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalGeomLocatorSc_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalGeomLocatorSc_cfg.py @@ -28,7 +28,7 @@ #################################################################### # Use the options -geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" +geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff" print("Geometry file: ", geomFile) process.load(geomFile) diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeomLocator_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeomLocator_cfg.py index d6a0b2c2a1d6f..0bfaa3081caf2 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalGeomLocator_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalGeomLocator_cfg.py @@ -28,7 +28,7 @@ #################################################################### # Use the options -geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" +geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff" print("Geometry file: ", geomFile) process.load(geomFile) diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py index f24ee3c17f95f..29768a1f12915 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py @@ -27,7 +27,7 @@ #################################################################### # Use the options -geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" +geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff" fileName = "HGCGeomStudy" + options.geometry + ".root" from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeometryMouseBite_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeometryMouseBite_cfg.py index edb59de716065..85eda5a0451a7 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalGeometryMouseBite_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalGeometryMouseBite_cfg.py @@ -28,7 +28,7 @@ #################################################################### # Use the options -geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" +geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff" print("Geometry file: ", geomFile) process.load(geomFile) diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeometryNewCorners_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeometryNewCorners_cfg.py index cc71585d3cf04..e4336f6f9c696 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalGeometryNewCorners_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalGeometryNewCorners_cfg.py @@ -28,7 +28,7 @@ #################################################################### # Use the options -geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" +geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff" print("Geometry file: ", geomFile) process.load(geomFile) diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeometryRotCheck_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeometryRotCheck_cfg.py index e4d3d7e000459..6164b51726a0d 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalGeometryRotCheck_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalGeometryRotCheck_cfg.py @@ -28,7 +28,7 @@ #################################################################### # Use the options -geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" +geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff" print("Geometry file: ", geomFile) process.load(geomFile) diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeometryRotTest_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeometryRotTest_cfg.py index 9cce380eb0c5d..51c64288f5244 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalGeometryRotTest_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalGeometryRotTest_cfg.py @@ -28,7 +28,7 @@ #################################################################### # Use the options -geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" +geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff" print("Geometry file: ", geomFile) process.load(geomFile) diff --git a/Geometry/HGCalGeometry/test/python/testHGCalNeighbor_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalNeighbor_cfg.py index 17de16f126d37..56c16c5805757 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalNeighbor_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalNeighbor_cfg.py @@ -4,7 +4,7 @@ process = cms.Process("PROD",Phase2C17I13M9) process.load("SimGeneral.HepPDTESSource.pdt_cfi") -process.load("Configuration.Geometry.GeometryExtended2026D92Reco_cff") +process.load("Configuration.Geometry.GeometryExtendedRun4D92Reco_cff") process.load('Configuration.StandardSequences.MagneticField_cff') process.load('TrackingTools.TrackAssociator.DetIdAssociatorESProducer_cff') process.load('FWCore.MessageService.MessageLogger_cfi') diff --git a/Geometry/HGCalGeometry/test/python/testHGCalRecHitTool_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalRecHitTool_cfg.py index b348d5c2c8396..bc9b7264cc93d 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalRecHitTool_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalRecHitTool_cfg.py @@ -3,9 +3,9 @@ process = cms.Process("PROD") process.load("SimGeneral.HepPDTESSource.pdt_cfi") -process.load("Configuration.Geometry.GeometryExtended2026D49Reco_cff") -#process.load("Configuration.Geometry.GeometryExtended2026D67Reco_cff") -#process.load("Configuration.Geometry.GeometryExtended2026D71Reco_cff") +process.load("Configuration.Geometry.GeometryExtendedRun4D49Reco_cff") +#process.load("Configuration.Geometry.GeometryExtendedRun4D67Reco_cff") +#process.load("Configuration.Geometry.GeometryExtendedRun4D71Reco_cff") process.load('FWCore.MessageService.MessageLogger_cfi') if hasattr(process,'MessageLogger'): diff --git a/Geometry/HGCalGeometry/test/python/testHGCalValidScintTest_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalValidScintTest_cfg.py index 9949b7f2fbcfe..4304262e5a173 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalValidScintTest_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalValidScintTest_cfg.py @@ -4,7 +4,7 @@ process = cms.Process('PROD',Phase2C17I13M9) process.load("SimGeneral.HepPDTESSource.pdt_cfi") -process.load("Configuration.Geometry.GeometryExtended2026D86Reco_cff") +process.load("Configuration.Geometry.GeometryExtendedRun4D86Reco_cff") process.load('FWCore.MessageService.MessageLogger_cfi') if hasattr(process,'MessageLogger'): diff --git a/Geometry/HGCalGeometry/test/python/testHGCalValidTest_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalValidTest_cfg.py index e11566e829b79..e8b25359e167d 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalValidTest_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalValidTest_cfg.py @@ -4,7 +4,7 @@ process = cms.Process('PROD',Phase2C17I13M9) process.load("SimGeneral.HepPDTESSource.pdt_cfi") -process.load("Configuration.Geometry.GeometryExtended2026D86Reco_cff") +process.load("Configuration.Geometry.GeometryExtendedRun4D86Reco_cff") process.load('FWCore.MessageService.MessageLogger_cfi') if hasattr(process,'MessageLogger'): diff --git a/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileCheck_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileCheck_cfg.py index 4a417efcc1981..b1d01e405fc1e 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileCheck_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileCheck_cfg.py @@ -28,7 +28,7 @@ from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('PROD',Phase2C17I13M9) -geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" +geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff" print("Geometry file: ", geomFile) process.load(geomFile) diff --git a/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileOrientation_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileOrientation_cfg.py index 74051b3f768b8..3b245f4326b3e 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileOrientation_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileOrientation_cfg.py @@ -2,7 +2,7 @@ from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('PROD',Phase2C17I13M9) -process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D86Reco_cff') process.load("SimGeneral.HepPDTESSource.pdt_cfi") process.load('Geometry.HGCalGeometry.hgcalWaferInFileOrientation_cfi') process.load('FWCore.MessageService.MessageLogger_cfi') diff --git a/Geometry/HGCalGeometry/test/python/testHGCalWaferTypeTester_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalWaferTypeTester_cfg.py index 6b88c65e93989..d037fd838969c 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalWaferTypeTester_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalWaferTypeTester_cfg.py @@ -28,7 +28,7 @@ from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('PROD',Phase2C17I13M9) -geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" +geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff" print("Geometry file: ", geomFile) process.load(geomFile) diff --git a/Geometry/HGCalGeometry/test/python/testHGCalWafer_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalWafer_cfg.py index aada58522c320..f4f5521272cbf 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalWafer_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalWafer_cfg.py @@ -3,7 +3,7 @@ process = cms.Process("PROD",Phase2C17I13M9) process.load("SimGeneral.HepPDTESSource.pdt_cfi") -process.load("Configuration.Geometry.GeometryExtended2026D86Reco_cff") +process.load("Configuration.Geometry.GeometryExtendedRun4D86Reco_cff") process.load('FWCore.MessageService.MessageLogger_cfi') if hasattr(process,'MessageLogger'): diff --git a/Geometry/HcalCommonData/python/GeometryDD4hepExtended2026D99Reco_cff.py b/Geometry/HcalCommonData/python/GeometryDD4hepExtended2026D99Reco_cff.py index 0b69f86df889f..a8af9767a68bf 100644 --- a/Geometry/HcalCommonData/python/GeometryDD4hepExtended2026D99Reco_cff.py +++ b/Geometry/HcalCommonData/python/GeometryDD4hepExtended2026D99Reco_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/HcalCommonData/data/dd4hep/cmsExtendedGeometry2026D99.xml") +DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/HcalCommonData/data/dd4hep/cmsExtendedGeometryRun4D99.xml") from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * diff --git a/Geometry/HcalCommonData/python/GeometryExtended2026D99Reco_cff.py b/Geometry/HcalCommonData/python/GeometryExtended2026D99Reco_cff.py index 1a68d30fe86a5..30f34619f075e 100644 --- a/Geometry/HcalCommonData/python/GeometryExtended2026D99Reco_cff.py +++ b/Geometry/HcalCommonData/python/GeometryExtended2026D99Reco_cff.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from Geometry.HcalCommonData.cmsExtendedGeometry2026D99XML_cfi import * +from Geometry.HcalCommonData.cmsExtendedGeometryRun4D99XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * diff --git a/Geometry/HcalCommonData/test/python/runHcalParametersFromDDDAnalyzer_cfg.py b/Geometry/HcalCommonData/test/python/runHcalParametersFromDDDAnalyzer_cfg.py index f0a616676eba8..bd0c12ef5d992 100644 --- a/Geometry/HcalCommonData/test/python/runHcalParametersFromDDDAnalyzer_cfg.py +++ b/Geometry/HcalCommonData/test/python/runHcalParametersFromDDDAnalyzer_cfg.py @@ -29,11 +29,11 @@ if (options.geometry == "D105"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process("HcalParametersTest",Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D105Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D105Reco_cff') elif (options.geometry == "D110"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process("HcalParametersTest",Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff') else: from Configuration.Eras.Era_Run3_DDD_cff import Run3_DDD process = cms.Process("HcalParametersTest",Run3_DDD) diff --git a/Geometry/HcalCommonData/test/python/runHcalRecNumberingDDDTester_cfg.py b/Geometry/HcalCommonData/test/python/runHcalRecNumberingDDDTester_cfg.py index 1019e7d2ab2e8..20b6e290904fa 100644 --- a/Geometry/HcalCommonData/test/python/runHcalRecNumberingDDDTester_cfg.py +++ b/Geometry/HcalCommonData/test/python/runHcalRecNumberingDDDTester_cfg.py @@ -4,7 +4,7 @@ process = cms.Process("HcalRecNumberingTest",Run3_DDD) process.load('Configuration.Geometry.GeometryExtended2021Reco_cff') -#process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') +#process.load('Configuration.Geometry.GeometryExtendedRun4D41Reco_cff') process.load('FWCore.MessageService.MessageLogger_cfi') if 'MessageLogger' in process.__dict__: diff --git a/Geometry/HcalCommonData/test/python/runHcalSimNumberingDDDTester_cfg.py b/Geometry/HcalCommonData/test/python/runHcalSimNumberingDDDTester_cfg.py index 84d627aeb65e0..5dc3bdd7e42dd 100644 --- a/Geometry/HcalCommonData/test/python/runHcalSimNumberingDDDTester_cfg.py +++ b/Geometry/HcalCommonData/test/python/runHcalSimNumberingDDDTester_cfg.py @@ -25,7 +25,7 @@ if (options.geometry == "Phase2"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process("HcalSimNumberingTest",Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D110_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D110_cff') else: from Configuration.Eras.Era_Run3_DDD_cff import Run3_DDD process = cms.Process("HcalSimNumberingTest",Run3_DDD) diff --git a/Geometry/TrackerGeometryBuilder/test/python/testPhase2TrackerHierarchy_cfg.py b/Geometry/TrackerGeometryBuilder/test/python/testPhase2TrackerHierarchy_cfg.py index d7b61b5e0430c..983b88fa80d65 100644 --- a/Geometry/TrackerGeometryBuilder/test/python/testPhase2TrackerHierarchy_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/python/testPhase2TrackerHierarchy_cfg.py @@ -10,7 +10,7 @@ _settings.DEFAULT_VERSION, # default value VarParsing.VarParsing.multiplicity.singleton, # singleton or list VarParsing.VarParsing.varType.string, # string, int, or float - "geometry version to use: 2026DXXX") + "geometry version to use: Run4DXXX") options.parseArguments() ################################################################### @@ -24,7 +24,7 @@ # Choose Tracker Geometry if(options.Scenario == _settings.DEFAULT_VERSION): print("Loading default scenario: ", _settings.DEFAULT_VERSION) - process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff') else: process.load('Configuration.Geometry.GeometryExtended'+options.Scenario+'Reco_cff') diff --git a/Geometry/TrackerGeometryBuilder/test/python/testPixelTopologyMapTest_cfg.py b/Geometry/TrackerGeometryBuilder/test/python/testPixelTopologyMapTest_cfg.py index d632ebdd258fc..e25dc5a3adf3c 100644 --- a/Geometry/TrackerGeometryBuilder/test/python/testPixelTopologyMapTest_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/python/testPixelTopologyMapTest_cfg.py @@ -42,8 +42,8 @@ process.load("Configuration.StandardSequences.Services_cff") if 'phase2' in options.globalTag: - process.load("Configuration.Geometry.GeometryExtended2026Default_cff") - process.load("Configuration.Geometry.GeometryExtended2026DefaultReco_cff") + process.load("Configuration.Geometry.GeometryExtendedRun4Default_cff") + process.load("Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff") else: process.load("Configuration.StandardSequences.GeometryRecoDB_cff") diff --git a/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDD4hep_cfg.py b/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDD4hep_cfg.py index 6eb4ead87f361..c1880a621d37e 100644 --- a/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDD4hep_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDD4hep_cfg.py @@ -10,7 +10,7 @@ _settings.DEFAULT_VERSION, # default value VarParsing.VarParsing.multiplicity.singleton, # singleton or list VarParsing.VarParsing.varType.string, # string, int, or float - "geometry version to use: 2026DXXX") + "geometry version to use: Run4DXXX") options.parseArguments() ################################################################### @@ -25,7 +25,7 @@ # Choose Tracker Geometry if(options.Scenario == _settings.DEFAULT_VERSION): print("Loading default scenario: ", _settings.DEFAULT_VERSION) - process.load('Configuration.Geometry.GeometryDD4hepExtended2026DefaultReco_cff') + process.load('Configuration.Geometry.GeometryDD4hepExtendedRun4DefaultReco_cff') else: process.load('Configuration.Geometry.GeometryDD4hepExtended'+options.Scenario+'Reco_cff') diff --git a/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDDD_cfg.py b/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDDD_cfg.py index f623a43a3943b..d303825897ed0 100644 --- a/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDDD_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDDD_cfg.py @@ -25,7 +25,7 @@ # Choose Tracker Geometry if(options.Scenario == _settings.DEFAULT_VERSION): print("Loading default scenario: ", _settings.DEFAULT_VERSION) - process.load('Configuration.Geometry.GeometryExtended2026Default_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4Default_cff') else: process.load('Configuration.Geometry.GeometryExtended'+options.Scenario+'_cff') diff --git a/L1Trigger/CSCTriggerPrimitives/test/runGEMCSCLUTAnalyzer_cfg.py b/L1Trigger/CSCTriggerPrimitives/test/runGEMCSCLUTAnalyzer_cfg.py index a603837a00310..52fe69afac7e7 100644 --- a/L1Trigger/CSCTriggerPrimitives/test/runGEMCSCLUTAnalyzer_cfg.py +++ b/L1Trigger/CSCTriggerPrimitives/test/runGEMCSCLUTAnalyzer_cfg.py @@ -5,7 +5,7 @@ process.load('Configuration.StandardSequences.MagneticField_cff') process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") -process.load('Configuration.Geometry.GeometryExtended2026D80Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D80Reco_cff') from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') diff --git a/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod.py b/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod.py index 57ee487b8d83c..54151fd7e4b03 100644 --- a/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod.py +++ b/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod.py @@ -2,8 +2,8 @@ process = cms.Process("L1DTTrigPhase2Prod") -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49_cff') process.load("L1Trigger.DTTriggerPhase2.dtTriggerPhase2PrimitiveDigis_cfi") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") diff --git a/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod_DEBUG_Grouping_cfg.py b/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod_DEBUG_Grouping_cfg.py index be5071aa2f817..0845f9c49a45b 100644 --- a/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod_DEBUG_Grouping_cfg.py +++ b/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod_DEBUG_Grouping_cfg.py @@ -2,8 +2,8 @@ process = cms.Process("L1DTTrigPhase2Prod") -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49_cff') process.load("L1Trigger.DTTriggerPhase2.dtTriggerPhase2PrimitiveDigis_cfi") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") diff --git a/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod_over_dTDigis_and_4Dsegments_cfg.py b/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod_over_dTDigis_and_4Dsegments_cfg.py index 797c375ffb841..b4779c29cddc9 100644 --- a/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod_over_dTDigis_and_4Dsegments_cfg.py +++ b/L1Trigger/DTTriggerPhase2/test/test_primitivesPhase2Prod_over_dTDigis_and_4Dsegments_cfg.py @@ -2,8 +2,8 @@ process = cms.Process("L1DTTrigPhase2Prod") -process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D41_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D41Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D41_cff') process.load("L1Trigger.DTTriggerPhase2.dtTriggerPhase2PrimitiveDigis_cfi") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") diff --git a/L1Trigger/DemonstratorTools/test/gtt/createFirmwareInputFiles_cfg.py b/L1Trigger/DemonstratorTools/test/gtt/createFirmwareInputFiles_cfg.py index 021d1e449df36..0d8b242cfca9a 100644 --- a/L1Trigger/DemonstratorTools/test/gtt/createFirmwareInputFiles_cfg.py +++ b/L1Trigger/DemonstratorTools/test/gtt/createFirmwareInputFiles_cfg.py @@ -67,8 +67,8 @@ process = cms.Process("GTTFileWriter") -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D88_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.GlobalTag import GlobalTag diff --git a/L1Trigger/DemonstratorTools/test/gtt/verifyFirmwareOutput_cfg.py b/L1Trigger/DemonstratorTools/test/gtt/verifyFirmwareOutput_cfg.py index f393086e4477f..ad4e83f08861f 100644 --- a/L1Trigger/DemonstratorTools/test/gtt/verifyFirmwareOutput_cfg.py +++ b/L1Trigger/DemonstratorTools/test/gtt/verifyFirmwareOutput_cfg.py @@ -26,8 +26,8 @@ process = cms.Process("GTTValidation") -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.GlobalTag import GlobalTag diff --git a/L1Trigger/L1CaloTrigger/test/test_L1CaloJets_cfg.py b/L1Trigger/L1CaloTrigger/test/test_L1CaloJets_cfg.py index c9f852eeeb29e..491632533bfe2 100644 --- a/L1Trigger/L1CaloTrigger/test/test_L1CaloJets_cfg.py +++ b/L1Trigger/L1CaloTrigger/test/test_L1CaloJets_cfg.py @@ -10,8 +10,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D41_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D41Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D41_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.SimL1Emulator_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') diff --git a/L1Trigger/L1THGCal/test/testHGCalBackendStage1ParameterExtractor_cfg.py b/L1Trigger/L1THGCal/test/testHGCalBackendStage1ParameterExtractor_cfg.py index 91bb96093febe..a0469f7b76c2b 100644 --- a/L1Trigger/L1THGCal/test/testHGCalBackendStage1ParameterExtractor_cfg.py +++ b/L1Trigger/L1THGCal/test/testHGCalBackendStage1ParameterExtractor_cfg.py @@ -9,8 +9,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D88_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp2_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp2_cfg.py index 911a73af748ca..3f06dd67cc06a 100644 --- a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp2_cfg.py +++ b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp2_cfg.py @@ -9,8 +9,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp3_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp3_cfg.py index 1fc3ac0ead156..df69a7c04ce42 100644 --- a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp3_cfg.py +++ b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV11Imp3_cfg.py @@ -9,8 +9,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV16Imp3_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV16Imp3_cfg.py index 0eec9c7bc4490..2cabea4a9941b 100644 --- a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV16Imp3_cfg.py +++ b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV16Imp3_cfg.py @@ -9,8 +9,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D88_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV9Imp2_Nose_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV9Imp2_Nose_cfg.py index 74898ebb0c945..d97f562aefcc4 100644 --- a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV9Imp2_Nose_cfg.py +++ b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV9Imp2_Nose_cfg.py @@ -9,8 +9,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D60Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D60_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D60Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D60_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/L1Trigger/L1THGCalUtilities/test/testCustomHGCalL1T_RelValV11_cfg.py b/L1Trigger/L1THGCalUtilities/test/testCustomHGCalL1T_RelValV11_cfg.py index 3002393221953..e443ebc58215b 100644 --- a/L1Trigger/L1THGCalUtilities/test/testCustomHGCalL1T_RelValV11_cfg.py +++ b/L1Trigger/L1THGCalUtilities/test/testCustomHGCalL1T_RelValV11_cfg.py @@ -9,8 +9,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelValV11_cfg.py b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelValV11_cfg.py index 621d24f12647c..0cd709de1fdf6 100644 --- a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelValV11_cfg.py +++ b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelValV11_cfg.py @@ -9,8 +9,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelValV16_cfg.py b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelValV16_cfg.py index b310842362bfc..56a4048986e8b 100644 --- a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelValV16_cfg.py +++ b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelValV16_cfg.py @@ -9,8 +9,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D88_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_V11_cfg.py b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_V11_cfg.py index 05489e19ebf40..5a7fdd13508d0 100644 --- a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_V11_cfg.py +++ b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_V11_cfg.py @@ -9,8 +9,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_V16_cfg.py b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_V16_cfg.py index 974fcf9286694..16d2ea8ea33a7 100644 --- a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_V16_cfg.py +++ b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_V16_cfg.py @@ -9,8 +9,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D88_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_with_truth_cfg.py b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_with_truth_cfg.py index a23e21a8edbe7..0d84be531b9d2 100644 --- a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_with_truth_cfg.py +++ b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_with_truth_cfg.py @@ -9,8 +9,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_newProcessors_V11_cfg.py b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_newProcessors_V11_cfg.py index 7beff5b968d4d..b74da67560ae0 100644 --- a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_newProcessors_V11_cfg.py +++ b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_newProcessors_V11_cfg.py @@ -9,8 +9,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_newProcessors_V16_cfg.py b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_newProcessors_V16_cfg.py index e1a71fb0b0a71..13e6e0009f805 100644 --- a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_newProcessors_V16_cfg.py +++ b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_newProcessors_V16_cfg.py @@ -9,8 +9,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D88_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_stage1Truncation_V11_cfg.py b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_stage1Truncation_V11_cfg.py index e47fea18adc91..ab3a76122ed42 100644 --- a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_stage1Truncation_V11_cfg.py +++ b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_stage1Truncation_V11_cfg.py @@ -9,8 +9,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_stage1Truncation_V16_cfg.py b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_stage1Truncation_V16_cfg.py index 96b271b71e483..62722b835aa9f 100644 --- a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_stage1Truncation_V16_cfg.py +++ b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_stage1Truncation_V16_cfg.py @@ -9,8 +9,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D88_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/L1Trigger/L1TMuonOverlapPhase1/test/expert/omtf/runMuonOverlapPatternGenerator.py b/L1Trigger/L1TMuonOverlapPhase1/test/expert/omtf/runMuonOverlapPatternGenerator.py index 48fb58493e58f..a83e4cbb0424e 100644 --- a/L1Trigger/L1TMuonOverlapPhase1/test/expert/omtf/runMuonOverlapPatternGenerator.py +++ b/L1Trigger/L1TMuonOverlapPhase1/test/expert/omtf/runMuonOverlapPatternGenerator.py @@ -59,8 +59,8 @@ process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -#process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') -#process.load('Configuration.Geometry.GeometryExtended2026D41_cff') +#process.load('Configuration.Geometry.GeometryExtendedRun4D41Reco_cff') +#process.load('Configuration.Geometry.GeometryExtendedRun4D41_cff') process.load('Configuration.StandardSequences.MagneticField_cff') #process.load('Configuration.StandardSequences.SimL1Emulator_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') diff --git a/L1Trigger/L1TMuonOverlapPhase1/test/expert/omtf/runMuonOverlapPatternGeneratorClassProb.py b/L1Trigger/L1TMuonOverlapPhase1/test/expert/omtf/runMuonOverlapPatternGeneratorClassProb.py index 889a26a9a6805..84e71af3b2d90 100644 --- a/L1Trigger/L1TMuonOverlapPhase1/test/expert/omtf/runMuonOverlapPatternGeneratorClassProb.py +++ b/L1Trigger/L1TMuonOverlapPhase1/test/expert/omtf/runMuonOverlapPatternGeneratorClassProb.py @@ -59,8 +59,8 @@ process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -#process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') -#process.load('Configuration.Geometry.GeometryExtended2026D41_cff') +#process.load('Configuration.Geometry.GeometryExtendedRun4D41Reco_cff') +#process.load('Configuration.Geometry.GeometryExtendedRun4D41_cff') process.load('Configuration.StandardSequences.MagneticField_cff') #process.load('Configuration.StandardSequences.SimL1Emulator_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') diff --git a/L1Trigger/L1TMuonOverlapPhase1/test/expert/omtf/runMuonOverlapPatternGenerator_displ.py b/L1Trigger/L1TMuonOverlapPhase1/test/expert/omtf/runMuonOverlapPatternGenerator_displ.py index ff81403ab04b0..d16849eb0cbf0 100644 --- a/L1Trigger/L1TMuonOverlapPhase1/test/expert/omtf/runMuonOverlapPatternGenerator_displ.py +++ b/L1Trigger/L1TMuonOverlapPhase1/test/expert/omtf/runMuonOverlapPatternGenerator_displ.py @@ -50,16 +50,16 @@ ) # PostLS1 geometry used -process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D86_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D86Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D86_cff') # import of standard configurations process.load('Configuration.StandardSequences.Services_cff') process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -#process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') -#process.load('Configuration.Geometry.GeometryExtended2026D41_cff') +#process.load('Configuration.Geometry.GeometryExtendedRun4D41Reco_cff') +#process.load('Configuration.Geometry.GeometryExtendedRun4D41_cff') process.load('Configuration.StandardSequences.MagneticField_cff') #process.load('Configuration.StandardSequences.SimL1Emulator_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') diff --git a/L1Trigger/L1TMuonOverlapPhase1/test/expert/omtf/runMuonOverlap_Pats0x0013_generateExtrFactors.py b/L1Trigger/L1TMuonOverlapPhase1/test/expert/omtf/runMuonOverlap_Pats0x0013_generateExtrFactors.py index fef62bdbc6cdc..eaa696a909b33 100644 --- a/L1Trigger/L1TMuonOverlapPhase1/test/expert/omtf/runMuonOverlap_Pats0x0013_generateExtrFactors.py +++ b/L1Trigger/L1TMuonOverlapPhase1/test/expert/omtf/runMuonOverlap_Pats0x0013_generateExtrFactors.py @@ -69,8 +69,8 @@ process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -#process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') -#process.load('Configuration.Geometry.GeometryExtended2026D41_cff') +#process.load('Configuration.Geometry.GeometryExtendedRun4D41Reco_cff') +#process.load('Configuration.Geometry.GeometryExtendedRun4D41_cff') process.load('Configuration.StandardSequences.MagneticField_cff') #process.load('Configuration.StandardSequences.SimL1Emulator_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') diff --git a/L1Trigger/L1TMuonOverlapPhase2/test/expert/runMuonOverlapPatternGeneratorClassProb_phase2.py b/L1Trigger/L1TMuonOverlapPhase2/test/expert/runMuonOverlapPatternGeneratorClassProb_phase2.py index 1424f262809c4..9c95e5e6ac909 100644 --- a/L1Trigger/L1TMuonOverlapPhase2/test/expert/runMuonOverlapPatternGeneratorClassProb_phase2.py +++ b/L1Trigger/L1TMuonOverlapPhase2/test/expert/runMuonOverlapPatternGeneratorClassProb_phase2.py @@ -52,8 +52,8 @@ #SkipEvent = cms.untracked.vstring('ProductNotFound') ) -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49_cff') # import of standard configurations process.load('Configuration.StandardSequences.Services_cff') diff --git a/L1Trigger/L1TMuonOverlapPhase2/test/expert/runMuonOverlapPatternGenerator_displ_phase2.py b/L1Trigger/L1TMuonOverlapPhase2/test/expert/runMuonOverlapPatternGenerator_displ_phase2.py index 85e275437f247..dce5fdb94beae 100644 --- a/L1Trigger/L1TMuonOverlapPhase2/test/expert/runMuonOverlapPatternGenerator_displ_phase2.py +++ b/L1Trigger/L1TMuonOverlapPhase2/test/expert/runMuonOverlapPatternGenerator_displ_phase2.py @@ -58,7 +58,7 @@ #process.load('FWCore.MessageService.MessageLogger_cfi') #process.load('Configuration.EventContent.EventContent_cff') #process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D95Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D95Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') #process.load('Configuration.StandardSequences.RawToDigi_cff') #process.load('Configuration.StandardSequences.SimL1Emulator_cff') diff --git a/L1Trigger/L1TMuonOverlapPhase2/test/expert/runMuonOverlapPatternGenerator_phase2.py b/L1Trigger/L1TMuonOverlapPhase2/test/expert/runMuonOverlapPatternGenerator_phase2.py index c2a761120ceb1..c2f49b7844644 100644 --- a/L1Trigger/L1TMuonOverlapPhase2/test/expert/runMuonOverlapPatternGenerator_phase2.py +++ b/L1Trigger/L1TMuonOverlapPhase2/test/expert/runMuonOverlapPatternGenerator_phase2.py @@ -64,7 +64,7 @@ #process.load('FWCore.MessageService.MessageLogger_cfi') #process.load('Configuration.EventContent.EventContent_cff') #process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D95Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D95Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') #process.load('Configuration.StandardSequences.RawToDigi_cff') #process.load('Configuration.StandardSequences.SimL1Emulator_cff') diff --git a/L1Trigger/L1TMuonOverlapPhase2/test/expert/runMuonOverlap_NN_Regression_FP.py b/L1Trigger/L1TMuonOverlapPhase2/test/expert/runMuonOverlap_NN_Regression_FP.py index 187d4862d2538..f29451c494b70 100644 --- a/L1Trigger/L1TMuonOverlapPhase2/test/expert/runMuonOverlap_NN_Regression_FP.py +++ b/L1Trigger/L1TMuonOverlapPhase2/test/expert/runMuonOverlap_NN_Regression_FP.py @@ -57,7 +57,7 @@ #process.load('FWCore.MessageService.MessageLogger_cfi') #process.load('Configuration.EventContent.EventContent_cff') #process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D95Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D95Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') #process.load('Configuration.StandardSequences.RawToDigi_cff') #process.load('Configuration.StandardSequences.SimL1Emulator_cff') diff --git a/L1Trigger/L1TMuonOverlapPhase2/test/runMuonOverlap.py b/L1Trigger/L1TMuonOverlapPhase2/test/runMuonOverlap.py index 7acdc37de5aef..5c94ff80c2386 100644 --- a/L1Trigger/L1TMuonOverlapPhase2/test/runMuonOverlap.py +++ b/L1Trigger/L1TMuonOverlapPhase2/test/runMuonOverlap.py @@ -52,7 +52,7 @@ #process.load('FWCore.MessageService.MessageLogger_cfi') #process.load('Configuration.EventContent.EventContent_cff') #process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D95Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D95Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') #process.load('Configuration.StandardSequences.RawToDigi_cff') #process.load('Configuration.StandardSequences.SimL1Emulator_cff') diff --git a/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py b/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py index 6c441a3ba61cc..335cadadb7315 100644 --- a/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py +++ b/L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py @@ -23,8 +23,8 @@ process.load('Configuration.StandardSequences.Services_cff') process.load('Configuration.EventContent.EventContent_cff') process.load('Configuration.StandardSequences.MagneticField_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') diff --git a/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py b/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py index dc8ec551fd186..0ad414a072c7b 100644 --- a/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py +++ b/L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py @@ -27,8 +27,8 @@ process.load('Configuration.StandardSequences.Services_cff') process.load('Configuration.EventContent.EventContent_cff') process.load('Configuration.StandardSequences.MagneticField_cff') -process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D110_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D110_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') diff --git a/L1Trigger/Phase2L1GMT/test/runGMT.py b/L1Trigger/Phase2L1GMT/test/runGMT.py index 4817dfaefd9f0..8260d79d9b150 100644 --- a/L1Trigger/Phase2L1GMT/test/runGMT.py +++ b/L1Trigger/Phase2L1GMT/test/runGMT.py @@ -15,7 +15,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.RawToDigi_cff') process.load('Configuration.StandardSequences.L1TrackTrigger_cff') diff --git a/L1Trigger/Phase2L1GMT/test/runMuonTrigger.py b/L1Trigger/Phase2L1GMT/test/runMuonTrigger.py index 10f844b9fc97f..9134c3e357a8e 100644 --- a/L1Trigger/Phase2L1GMT/test/runMuonTrigger.py +++ b/L1Trigger/Phase2L1GMT/test/runMuonTrigger.py @@ -15,7 +15,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.RawToDigi_cff') process.load('Configuration.StandardSequences.L1TrackTrigger_cff') diff --git a/L1Trigger/Phase2L1GMT/test/test.py b/L1Trigger/Phase2L1GMT/test/test.py index 24b5aa9beb15d..3cf08643f67a1 100644 --- a/L1Trigger/Phase2L1GMT/test/test.py +++ b/L1Trigger/Phase2L1GMT/test/test.py @@ -15,7 +15,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.L1TrackTrigger_cff') # Needed for MuonTPS process.load('Configuration.StandardSequences.EndOfProcess_cff') diff --git a/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_fromRAW_cfg.py b/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_fromRAW_cfg.py index cd99991a62a92..c0a15ebcdff85 100644 --- a/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_fromRAW_cfg.py +++ b/L1Trigger/Phase2L1ParticleFlow/test/make_l1ctLayer1_dumpFiles_fromRAW_cfg.py @@ -18,8 +18,8 @@ fileNames = cms.untracked.vstring('/store/mc/Phase2HLTTDRWinter20DIGI/TT_TuneCP5_14TeV-powheg-pythia8/GEN-SIM-DIGI-RAW/PU200_110X_mcRun4_realistic_v3-v2/110000/005E74D6-B50E-674E-89E6-EAA9A617B476.root',) ) -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') process.load('Configuration.StandardSequences.EndOfProcess_cff') diff --git a/L1Trigger/Phase2L1ParticleFlow/test/make_l1ct_binaryFiles_cfg.py b/L1Trigger/Phase2L1ParticleFlow/test/make_l1ct_binaryFiles_cfg.py index f6fa74b4ddfea..6abf8e9d7c1f1 100644 --- a/L1Trigger/Phase2L1ParticleFlow/test/make_l1ct_binaryFiles_cfg.py +++ b/L1Trigger/Phase2L1ParticleFlow/test/make_l1ct_binaryFiles_cfg.py @@ -43,8 +43,8 @@ skipEvents = cms.untracked.uint32(0), ) -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D88_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('SimCalorimetry.HcalTrigPrimProducers.hcaltpdigi_cff') # needed to read HCal TPs process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') diff --git a/L1Trigger/Phase2L1ParticleFlow/test/make_l1ct_patternFiles_fromRAW_cfg.py b/L1Trigger/Phase2L1ParticleFlow/test/make_l1ct_patternFiles_fromRAW_cfg.py index 073f0f910e342..c519341d5963e 100644 --- a/L1Trigger/Phase2L1ParticleFlow/test/make_l1ct_patternFiles_fromRAW_cfg.py +++ b/L1Trigger/Phase2L1ParticleFlow/test/make_l1ct_patternFiles_fromRAW_cfg.py @@ -18,8 +18,8 @@ fileNames = cms.untracked.vstring('/store/mc/Phase2HLTTDRWinter20DIGI/TT_TuneCP5_14TeV-powheg-pythia8/GEN-SIM-DIGI-RAW/PU200_110X_mcRun4_realistic_v3-v2/110000/005E74D6-B50E-674E-89E6-EAA9A617B476.root',) ) -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') process.load('Configuration.StandardSequences.EndOfProcess_cff') diff --git a/L1Trigger/TrackFindingTMTT/test/tmtt_tf_analysis_cfg.py b/L1Trigger/TrackFindingTMTT/test/tmtt_tf_analysis_cfg.py index 000187debb365..137826e306a4c 100644 --- a/L1Trigger/TrackFindingTMTT/test/tmtt_tf_analysis_cfg.py +++ b/L1Trigger/TrackFindingTMTT/test/tmtt_tf_analysis_cfg.py @@ -15,8 +15,8 @@ if GEOMETRY == "D88": print("using geometry " + GEOMETRY + " (tilted)") - process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') - process.load('Configuration.Geometry.GeometryExtended2026D88_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D88Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D88_cff') else: print("this is not a valid geometry!!!") diff --git a/L1Trigger/TrackFindingTracklet/test/HybridTracksNewKF_cfg.py b/L1Trigger/TrackFindingTracklet/test/HybridTracksNewKF_cfg.py index 5ef7ea33154b3..601872f487349 100644 --- a/L1Trigger/TrackFindingTracklet/test/HybridTracksNewKF_cfg.py +++ b/L1Trigger/TrackFindingTracklet/test/HybridTracksNewKF_cfg.py @@ -12,8 +12,8 @@ process = cms.Process( "Demo" ) process.load( 'FWCore.MessageService.MessageLogger_cfi' ) process.load( 'Configuration.EventContent.EventContent_cff' ) -process.load( 'Configuration.Geometry.GeometryExtended2026D88Reco_cff' ) -process.load( 'Configuration.Geometry.GeometryExtended2026D88_cff' ) +process.load( 'Configuration.Geometry.GeometryExtendedRun4D88Reco_cff' ) +process.load( 'Configuration.Geometry.GeometryExtendedRun4D88_cff' ) process.load( 'Configuration.StandardSequences.MagneticField_cff' ) process.load( 'Configuration.StandardSequences.FrontierConditions_GlobalTag_cff' ) process.load( 'L1Trigger.TrackTrigger.TrackTrigger_cff' ) diff --git a/L1Trigger/TrackFindingTracklet/test/HybridTracks_cfg.py b/L1Trigger/TrackFindingTracklet/test/HybridTracks_cfg.py index 0c49a60bf6167..e782d84048448 100644 --- a/L1Trigger/TrackFindingTracklet/test/HybridTracks_cfg.py +++ b/L1Trigger/TrackFindingTracklet/test/HybridTracks_cfg.py @@ -15,8 +15,8 @@ process.load('Configuration.EventContent.EventContent_cff') process.load('Configuration.StandardSequences.MagneticField_cff') -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D88_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D88_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') diff --git a/L1Trigger/TrackFindingTracklet/test/demonstrator_cfg.py b/L1Trigger/TrackFindingTracklet/test/demonstrator_cfg.py index fe180df9069d5..77406528debd0 100644 --- a/L1Trigger/TrackFindingTracklet/test/demonstrator_cfg.py +++ b/L1Trigger/TrackFindingTracklet/test/demonstrator_cfg.py @@ -4,8 +4,8 @@ process = cms.Process( "Demo" ) process.load( 'FWCore.MessageService.MessageLogger_cfi' ) process.load( 'Configuration.EventContent.EventContent_cff' ) -process.load( 'Configuration.Geometry.GeometryExtended2026D88Reco_cff' ) -process.load( 'Configuration.Geometry.GeometryExtended2026D88_cff' ) +process.load( 'Configuration.Geometry.GeometryExtendedRun4D88Reco_cff' ) +process.load( 'Configuration.Geometry.GeometryExtendedRun4D88_cff' ) process.load( 'Configuration.StandardSequences.MagneticField_cff' ) process.load( 'Configuration.StandardSequences.FrontierConditions_GlobalTag_cff' ) process.load( 'L1Trigger.TrackTrigger.TrackTrigger_cff' ) diff --git a/L1Trigger/TrackFindingTracklet/test/skimForCI_cfg.py b/L1Trigger/TrackFindingTracklet/test/skimForCI_cfg.py index bba49658cdae2..f0109a01ad07e 100644 --- a/L1Trigger/TrackFindingTracklet/test/skimForCI_cfg.py +++ b/L1Trigger/TrackFindingTracklet/test/skimForCI_cfg.py @@ -39,8 +39,8 @@ process.load('Configuration.StandardSequences.MagneticField_cff') # D88 geometry (T24 tracker) -process.load('Configuration.Geometry.GeometryExtended2026D98Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D98_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D98Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D98_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') diff --git a/L1Trigger/TrackerTFP/test/demonstrator_cfg.py b/L1Trigger/TrackerTFP/test/demonstrator_cfg.py index 787c2acc85bc2..7d8f493cb7307 100644 --- a/L1Trigger/TrackerTFP/test/demonstrator_cfg.py +++ b/L1Trigger/TrackerTFP/test/demonstrator_cfg.py @@ -3,8 +3,8 @@ process = cms.Process( "Demo" ) process.load( 'FWCore.MessageService.MessageLogger_cfi' ) -process.load( 'Configuration.Geometry.GeometryExtended2026D88Reco_cff' ) -process.load( 'Configuration.Geometry.GeometryExtended2026D88_cff' ) +process.load( 'Configuration.Geometry.GeometryExtendedRun4D88Reco_cff' ) +process.load( 'Configuration.Geometry.GeometryExtendedRun4D88_cff' ) process.load( 'Configuration.StandardSequences.MagneticField_cff' ) process.load( 'Configuration.StandardSequences.FrontierConditions_GlobalTag_cff' ) process.load( 'L1Trigger.TrackTrigger.TrackTrigger_cff' ) diff --git a/L1Trigger/TrackerTFP/test/test_cfg.py b/L1Trigger/TrackerTFP/test/test_cfg.py index efaa1e64f12b7..b4836e0ff0e9e 100644 --- a/L1Trigger/TrackerTFP/test/test_cfg.py +++ b/L1Trigger/TrackerTFP/test/test_cfg.py @@ -10,8 +10,8 @@ process = cms.Process( "Demo" ) process.load( 'FWCore.MessageService.MessageLogger_cfi' ) -process.load( 'Configuration.Geometry.GeometryExtended2026D88Reco_cff' ) -process.load( 'Configuration.Geometry.GeometryExtended2026D88_cff' ) +process.load( 'Configuration.Geometry.GeometryExtendedRun4D88Reco_cff' ) +process.load( 'Configuration.Geometry.GeometryExtendedRun4D88_cff' ) process.load( 'Configuration.StandardSequences.MagneticField_cff' ) process.load( 'Configuration.StandardSequences.FrontierConditions_GlobalTag_cff' ) process.load( 'L1Trigger.TrackTrigger.TrackTrigger_cff' ) diff --git a/RecoHGCal/TICL/test/ticlDebugger_cfg.py b/RecoHGCal/TICL/test/ticlDebugger_cfg.py index 44582be049cd3..76cef2d34e454 100644 --- a/RecoHGCal/TICL/test/ticlDebugger_cfg.py +++ b/RecoHGCal/TICL/test/ticlDebugger_cfg.py @@ -3,7 +3,7 @@ process = cms.Process("TICLDEBUG") process.load("FWCore.MessageService.MessageLogger_cfi") -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T15', '') diff --git a/RecoLocalCalo/EcalRecProducers/test/testEcalUncalibRecHitPhase2WeightsProducer.py b/RecoLocalCalo/EcalRecProducers/test/testEcalUncalibRecHitPhase2WeightsProducer.py index 414409a58af9e..a3b86a1f71257 100644 --- a/RecoLocalCalo/EcalRecProducers/test/testEcalUncalibRecHitPhase2WeightsProducer.py +++ b/RecoLocalCalo/EcalRecProducers/test/testEcalUncalibRecHitPhase2WeightsProducer.py @@ -14,7 +14,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D60Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D60Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.RawToDigi_cff') process.load('Configuration.StandardSequences.L1Reco_cff') diff --git a/RecoLocalCalo/EcalRecProducers/test/testEcalUncalibRecHitPhase2WeightsProducerGPU.py b/RecoLocalCalo/EcalRecProducers/test/testEcalUncalibRecHitPhase2WeightsProducerGPU.py index ea98be71cc5f1..7e2707a5d6725 100644 --- a/RecoLocalCalo/EcalRecProducers/test/testEcalUncalibRecHitPhase2WeightsProducerGPU.py +++ b/RecoLocalCalo/EcalRecProducers/test/testEcalUncalibRecHitPhase2WeightsProducerGPU.py @@ -13,7 +13,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D60Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D60Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.RawToDigi_cff') process.load('Configuration.StandardSequences.L1Reco_cff') diff --git a/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferDigi_cfg.py b/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferDigi_cfg.py index 1cb959b036f84..4f813fa0c09b3 100644 --- a/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferDigi_cfg.py +++ b/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferDigi_cfg.py @@ -3,7 +3,7 @@ process = cms.Process("TestPartial",Phase2C11) process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") -process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff") +process.load("Configuration.Geometry.GeometryExtendedRun4D110Reco_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load('FWCore.MessageService.MessageLogger_cfi') process.load('RecoLocalCalo.HGCalRecAlgos.hgcalRecHitToolsPartialWafer_cff') diff --git a/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferRecHit_cfg.py b/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferRecHit_cfg.py index 2dce44afac6b1..3e50f40c7dc13 100644 --- a/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferRecHit_cfg.py +++ b/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferRecHit_cfg.py @@ -3,7 +3,7 @@ process = cms.Process("TestPartial",Phase2C11) process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") -process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff") +process.load("Configuration.Geometry.GeometryExtendedRun4D110Reco_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load('FWCore.MessageService.MessageLogger_cfi') process.load('RecoLocalCalo.HGCalRecAlgos.hgcalRecHitToolsPartialWafer_cff') diff --git a/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferSimHit_cfg.py b/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferSimHit_cfg.py index 37a1426f73017..f8a866e8843ba 100644 --- a/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferSimHit_cfg.py +++ b/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferSimHit_cfg.py @@ -4,7 +4,7 @@ process = cms.Process("PROD",Phase2C11) process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi") -process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff") +process.load("Configuration.Geometry.GeometryExtendedRun4D110Reco_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("Configuration.EventContent.EventContent_cff") process.load('Configuration.StandardSequences.Generator_cff') diff --git a/RecoLocalCalo/HGCalRecAlgos/test/testHGCalRecHitTools_cfg.py b/RecoLocalCalo/HGCalRecAlgos/test/testHGCalRecHitTools_cfg.py index 78bc13d5f5874..7f6e0f07fac7a 100644 --- a/RecoLocalCalo/HGCalRecAlgos/test/testHGCalRecHitTools_cfg.py +++ b/RecoLocalCalo/HGCalRecAlgos/test/testHGCalRecHitTools_cfg.py @@ -4,7 +4,7 @@ process = cms.Process('PROD',Phase2C11) process.load("SimGeneral.HepPDTESSource.pdt_cfi") -process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D86Reco_cff') process.load('FWCore.MessageService.MessageLogger_cfi') process.load("RecoLocalCalo.HGCalRecAlgos.hgcalRecHitTools_cfi") diff --git a/RecoLocalCalo/HGCalRecProducers/test/HeterogeneousHGCalRecHit_cfg.py b/RecoLocalCalo/HGCalRecProducers/test/HeterogeneousHGCalRecHit_cfg.py index 4ff82b8f5bd80..5503fccacdd98 100644 --- a/RecoLocalCalo/HGCalRecProducers/test/HeterogeneousHGCalRecHit_cfg.py +++ b/RecoLocalCalo/HGCalRecProducers/test/HeterogeneousHGCalRecHit_cfg.py @@ -43,7 +43,7 @@ def getHeterogeneousRecHitsSource(pu): process.load('Configuration.StandardSequences.MagneticField_cff') #process.load('Configuration.EventContent.EventContent_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') process.load('HeterogeneousCore.CUDACore.ProcessAcceleratorCUDA_cfi') process.load('RecoLocalCalo.HGCalRecProducers.HGCalRecHit_cfi') process.load('SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi') diff --git a/RecoLocalCalo/HGCalRecProducers/test/HeterogeneousRecHitsTiming_cfg.py b/RecoLocalCalo/HGCalRecProducers/test/HeterogeneousRecHitsTiming_cfg.py index b79e90f5421e7..37e451cf7f8ea 100644 --- a/RecoLocalCalo/HGCalRecProducers/test/HeterogeneousRecHitsTiming_cfg.py +++ b/RecoLocalCalo/HGCalRecProducers/test/HeterogeneousRecHitsTiming_cfg.py @@ -14,7 +14,7 @@ process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') process.load('HeterogeneousCore.CUDACore.ProcessAcceleratorCUDA_cfi') process.load('RecoLocalCalo.HGCalRecProducers.HGCalRecHit_cfi') process.load('SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi') diff --git a/RecoLocalTracker/SiPhase2VectorHitBuilder/test/Clusters_productionAndTesting.py b/RecoLocalTracker/SiPhase2VectorHitBuilder/test/Clusters_productionAndTesting.py index 88280d0c33370..6310ca7c94341 100644 --- a/RecoLocalTracker/SiPhase2VectorHitBuilder/test/Clusters_productionAndTesting.py +++ b/RecoLocalTracker/SiPhase2VectorHitBuilder/test/Clusters_productionAndTesting.py @@ -10,7 +10,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.RawToDigi_cff') process.load('Configuration.StandardSequences.L1Reco_cff') diff --git a/RecoLocalTracker/SiPhase2VectorHitBuilder/test/VHs_SeedingOT_productionAndTesting.py b/RecoLocalTracker/SiPhase2VectorHitBuilder/test/VHs_SeedingOT_productionAndTesting.py index ac5fdd513eb95..a32dd2b6eba6d 100644 --- a/RecoLocalTracker/SiPhase2VectorHitBuilder/test/VHs_SeedingOT_productionAndTesting.py +++ b/RecoLocalTracker/SiPhase2VectorHitBuilder/test/VHs_SeedingOT_productionAndTesting.py @@ -10,7 +10,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.RawToDigi_cff') process.load('Configuration.StandardSequences.L1Reco_cff') diff --git a/RecoLocalTracker/SiPhase2VectorHitBuilder/test/VHs_combinatorialStudies_PU200.py b/RecoLocalTracker/SiPhase2VectorHitBuilder/test/VHs_combinatorialStudies_PU200.py index 00f5665e19c87..55ec15aa6e9d8 100644 --- a/RecoLocalTracker/SiPhase2VectorHitBuilder/test/VHs_combinatorialStudies_PU200.py +++ b/RecoLocalTracker/SiPhase2VectorHitBuilder/test/VHs_combinatorialStudies_PU200.py @@ -11,7 +11,7 @@ process.load('Configuration.EventContent.EventContent_cff') #process.load('SimGeneral.MixingModule.mixNoPU_cfi') process.load('SimGeneral.MixingModule.mix_POISSON_average_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.RawToDigi_cff') process.load('Configuration.StandardSequences.L1Reco_cff') diff --git a/RecoLocalTracker/SiPhase2VectorHitBuilder/test/VHs_productionAndTesting.py b/RecoLocalTracker/SiPhase2VectorHitBuilder/test/VHs_productionAndTesting.py index cbb75e27d744a..7616d82baa387 100644 --- a/RecoLocalTracker/SiPhase2VectorHitBuilder/test/VHs_productionAndTesting.py +++ b/RecoLocalTracker/SiPhase2VectorHitBuilder/test/VHs_productionAndTesting.py @@ -10,7 +10,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.RawToDigi_cff') process.load('Configuration.StandardSequences.L1Reco_cff') diff --git a/RecoMTD/DetLayers/test/mtd_cfg.py b/RecoMTD/DetLayers/test/mtd_cfg.py index 11a967feba766..0e01676ca3336 100644 --- a/RecoMTD/DetLayers/test/mtd_cfg.py +++ b/RecoMTD/DetLayers/test/mtd_cfg.py @@ -54,7 +54,7 @@ threshold = cms.untracked.string('INFO')) # Choose Tracker Geometry -process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff") +process.load("Configuration.Geometry.GeometryExtendedRun4D110Reco_cff") process.load("MagneticField.Engine.volumeBasedMagneticField_160812_cfi") process.Timing = cms.Service("Timing") diff --git a/RecoTracker/MkFit/test/dumpMkFitGeometryPhase2.py b/RecoTracker/MkFit/test/dumpMkFitGeometryPhase2.py index cb70716227268..a3001b12abc27 100644 --- a/RecoTracker/MkFit/test/dumpMkFitGeometryPhase2.py +++ b/RecoTracker/MkFit/test/dumpMkFitGeometryPhase2.py @@ -16,7 +16,7 @@ # import of standard configurations process.load('Configuration.StandardSequences.Services_cff') process.load('FWCore.MessageService.MessageLogger_cfi') -process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Reconstruction_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') diff --git a/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py b/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py index eccc3123a23c3..509581f56d29e 100644 --- a/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py +++ b/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py @@ -15,7 +15,7 @@ process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') #process.load('SimGeneral.MixingModule.mix_POISSON_average_cfi') -process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Digi_cff') process.load('Configuration.StandardSequences.SimL1Emulator_cff') diff --git a/SLHCUpgradeSimulations/Geometry/test/phase2_reco_pixelntuple_cfg.py b/SLHCUpgradeSimulations/Geometry/test/phase2_reco_pixelntuple_cfg.py index 1a73ffde66381..07bf5a634aeec 100644 --- a/SLHCUpgradeSimulations/Geometry/test/phase2_reco_pixelntuple_cfg.py +++ b/SLHCUpgradeSimulations/Geometry/test/phase2_reco_pixelntuple_cfg.py @@ -15,7 +15,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D66Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D66Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.RawToDigi_cff') process.load('Configuration.StandardSequences.L1Reco_cff') diff --git a/SLHCUpgradeSimulations/Geometry/test/writeFile_phase2_cfg.py b/SLHCUpgradeSimulations/Geometry/test/writeFile_phase2_cfg.py index 0cc7003d08fb2..a0b724f245c6e 100644 --- a/SLHCUpgradeSimulations/Geometry/test/writeFile_phase2_cfg.py +++ b/SLHCUpgradeSimulations/Geometry/test/writeFile_phase2_cfg.py @@ -8,7 +8,7 @@ process = cms.Process("ICALIB",_PH2_ERA) process.load("Configuration.StandardSequences.Services_cff") -process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff') process.trackerGeometry.applyAlignment = cms.bool(False) diff --git a/SimCalorimetry/HGCalSimAlgos/test/hfnoseNoiseMapTester_cfg.py b/SimCalorimetry/HGCalSimAlgos/test/hfnoseNoiseMapTester_cfg.py index 1464dfff04c68..42e8fd3ab3048 100644 --- a/SimCalorimetry/HGCalSimAlgos/test/hfnoseNoiseMapTester_cfg.py +++ b/SimCalorimetry/HGCalSimAlgos/test/hfnoseNoiseMapTester_cfg.py @@ -12,7 +12,7 @@ process = cms.Process('demo',Phase2C10) process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") -process.load('Configuration.Geometry.GeometryExtended2026D60Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D60Reco_cff') from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') diff --git a/SimCalorimetry/HGCalSimAlgos/test/hgchebacksignalscaler_cfg.py b/SimCalorimetry/HGCalSimAlgos/test/hgchebacksignalscaler_cfg.py index a8dfeb6c063a0..960a42d2c0569 100644 --- a/SimCalorimetry/HGCalSimAlgos/test/hgchebacksignalscaler_cfg.py +++ b/SimCalorimetry/HGCalSimAlgos/test/hgchebacksignalscaler_cfg.py @@ -1,4 +1,4 @@ -#run with: cmsRun test/hgchebacksignalscaler_cfg.py doseMap=SimCalorimetry/HGCalSimProducers/data/doseParams_3000fb_fluka-3.7.20.txt geom=GeometryExtended2026D49Reco +#run with: cmsRun test/hgchebacksignalscaler_cfg.py doseMap=SimCalorimetry/HGCalSimProducers/data/doseParams_3000fb_fluka-3.7.20.txt geom=GeometryExtendedRun4D49Reco import FWCore.ParameterSet.Config as cms from FWCore.ParameterSet.VarParsing import VarParsing @@ -7,7 +7,7 @@ options = VarParsing() options.register("doseMap", "SimCalorimetry/HGCalSimProducers/data/doseParams_3000fb_fluka-3.7.20.txt", VarParsing.multiplicity.singleton, VarParsing.varType.string) options.register("sipmMap", "SimCalorimetry/HGCalSimProducers/data/sipmParams_geom-10.txt", VarParsing.multiplicity.singleton, VarParsing.varType.string) -options.register("geometry", "GeometryExtended2026D49Reco", VarParsing.multiplicity.singleton, VarParsing.varType.string) +options.register("geometry", "GeometryExtendedRun4D49Reco", VarParsing.multiplicity.singleton, VarParsing.varType.string) options.parseArguments() from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9 diff --git a/SimCalorimetry/HGCalSimAlgos/test/hgcsiNoiseMapTester_cfg.py b/SimCalorimetry/HGCalSimAlgos/test/hgcsiNoiseMapTester_cfg.py index 91161ca03b1d1..bf4851c147095 100644 --- a/SimCalorimetry/HGCalSimAlgos/test/hgcsiNoiseMapTester_cfg.py +++ b/SimCalorimetry/HGCalSimAlgos/test/hgcsiNoiseMapTester_cfg.py @@ -1,4 +1,4 @@ -#run with: cmsRun hgcsiNoiseMapTester_cfg.py doseMap=SimCalorimetry/HGCalSimProducers/data/doseParams_3000fb_fluka-3.7.20.txt geometry=GeometryExtended2026D49Reco +#run with: cmsRun hgcsiNoiseMapTester_cfg.py doseMap=SimCalorimetry/HGCalSimProducers/data/doseParams_3000fb_fluka-3.7.20.txt geometry=GeometryExtendedRun4D49Reco import FWCore.ParameterSet.Config as cms from FWCore.ParameterSet.VarParsing import VarParsing @@ -6,7 +6,7 @@ options = VarParsing() options.register ("doseMap", "SimCalorimetry/HGCalSimProducers/data/doseParams_3000fb_fluka-3.7.20.txt", VarParsing.multiplicity.singleton, VarParsing.varType.string) -options.register ("geometry", "GeometryExtended2026D49Reco", VarParsing.multiplicity.singleton, VarParsing.varType.string) +options.register ("geometry", "GeometryExtendedRun4D49Reco", VarParsing.multiplicity.singleton, VarParsing.varType.string) options.register ("conditions", "TDR_600V", VarParsing.multiplicity.singleton, VarParsing.varType.string) options.parseArguments() diff --git a/SimG4CMS/Calo/test/python/Gen_MinBias.py b/SimG4CMS/Calo/test/python/Gen_MinBias.py index ae85d1a7483af..2dbd0cdea0572 100644 --- a/SimG4CMS/Calo/test/python/Gen_MinBias.py +++ b/SimG4CMS/Calo/test/python/Gen_MinBias.py @@ -32,7 +32,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D98Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D98Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC_cfi') diff --git a/SimG4CMS/Calo/test/python/Gen_SingleMuon.py b/SimG4CMS/Calo/test/python/Gen_SingleMuon.py index a64e76671d659..0bd6355c774b7 100644 --- a/SimG4CMS/Calo/test/python/Gen_SingleMuon.py +++ b/SimG4CMS/Calo/test/python/Gen_SingleMuon.py @@ -44,7 +44,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D98Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D98Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC_cfi') diff --git a/SimG4CMS/Calo/test/python/Sim2026_cfg.py b/SimG4CMS/Calo/test/python/SimRun4_cfg.py similarity index 100% rename from SimG4CMS/Calo/test/python/Sim2026_cfg.py rename to SimG4CMS/Calo/test/python/SimRun4_cfg.py diff --git a/SimG4CMS/Calo/test/python/minbias2026_cfg.py b/SimG4CMS/Calo/test/python/minbiasRun4_cfg.py similarity index 96% rename from SimG4CMS/Calo/test/python/minbias2026_cfg.py rename to SimG4CMS/Calo/test/python/minbiasRun4_cfg.py index a6d0f2c58a018..119d608da990b 100644 --- a/SimG4CMS/Calo/test/python/minbias2026_cfg.py +++ b/SimG4CMS/Calo/test/python/minbiasRun4_cfg.py @@ -31,9 +31,9 @@ elif (options.type == "V17Shift"): geomFile = "Geometry.HGCalCommonData.testHGCal" + options.type + "Reco_cff" elif (options.type == "V17"): - geomFile = "Configuration.Geometry.GeometryExtended2026D110Reco_cff" + geomFile = "Configuration.Geometry.GeometryExtendedRun4D110Reco_cff" else: - geomFile = "Configuration.Geometry.GeometryExtended2026D100Reco_cff" + geomFile = "Configuration.Geometry.GeometryExtendedRun4D100Reco_cff" outFile = "minbias" + options.type + ".root" diff --git a/SimG4CMS/Calo/test/python/runHGC2_cfg.py b/SimG4CMS/Calo/test/python/runHGC2_cfg.py index b05d2c88b4bb0..fe1627ab1124f 100644 --- a/SimG4CMS/Calo/test/python/runHGC2_cfg.py +++ b/SimG4CMS/Calo/test/python/runHGC2_cfg.py @@ -5,7 +5,7 @@ process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi") -process.load("Configuration.Geometry.GeometryExtended2026D83Reco_cff") +process.load("Configuration.Geometry.GeometryExtendedRun4D83Reco_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("Configuration.EventContent.EventContent_cff") process.load('Configuration.StandardSequences.Generator_cff') diff --git a/SimG4CMS/Calo/test/python/runHGC3_cfg.py b/SimG4CMS/Calo/test/python/runHGC3_cfg.py index 87f78164ad3b0..58045d2027cab 100644 --- a/SimG4CMS/Calo/test/python/runHGC3_cfg.py +++ b/SimG4CMS/Calo/test/python/runHGC3_cfg.py @@ -5,8 +5,8 @@ process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi") -process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D77_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D77Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D77_cff') process.load("Configuration.StandardSequences.MagneticField_cff") process.load("Configuration.EventContent.EventContent_cff") process.load('Configuration.StandardSequences.Generator_cff') diff --git a/SimG4CMS/Calo/test/python/runHGC4_cfg.py b/SimG4CMS/Calo/test/python/runHGC4_cfg.py index 6cc391f467cc5..492fd5be135f2 100644 --- a/SimG4CMS/Calo/test/python/runHGC4_cfg.py +++ b/SimG4CMS/Calo/test/python/runHGC4_cfg.py @@ -4,7 +4,7 @@ process = cms.Process("PROD",Phase2C11) process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi") -process.load("Configuration.Geometry.GeometryExtended2026D77Reco_cff") +process.load("Configuration.Geometry.GeometryExtendedRun4D77Reco_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("Configuration.EventContent.EventContent_cff") process.load('Configuration.StandardSequences.Generator_cff') diff --git a/SimG4CMS/Calo/test/python/runHGC5_cfg.py b/SimG4CMS/Calo/test/python/runHGC5_cfg.py index 780612ecf69cf..065368d6847e9 100644 --- a/SimG4CMS/Calo/test/python/runHGC5_cfg.py +++ b/SimG4CMS/Calo/test/python/runHGC5_cfg.py @@ -5,7 +5,7 @@ process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi") -process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D83Reco_cff') process.load("Configuration.StandardSequences.MagneticField_cff") process.load("Configuration.EventContent.EventContent_cff") process.load('Configuration.StandardSequences.Generator_cff') diff --git a/SimG4CMS/Calo/test/python/runHGC6_cfg.py b/SimG4CMS/Calo/test/python/runHGC6_cfg.py index 6f910e2c685ab..815f560ace858 100644 --- a/SimG4CMS/Calo/test/python/runHGC6_cfg.py +++ b/SimG4CMS/Calo/test/python/runHGC6_cfg.py @@ -5,7 +5,7 @@ process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi") -process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D86Reco_cff') process.load("Configuration.StandardSequences.MagneticField_cff") process.load("Configuration.EventContent.EventContent_cff") process.load('Configuration.StandardSequences.Generator_cff') diff --git a/SimG4CMS/Calo/test/python/runHGC7_cfg.py b/SimG4CMS/Calo/test/python/runHGC7_cfg.py index 9d21161150ed3..3345c24e653f2 100644 --- a/SimG4CMS/Calo/test/python/runHGC7_cfg.py +++ b/SimG4CMS/Calo/test/python/runHGC7_cfg.py @@ -4,7 +4,7 @@ process = cms.Process("PROD",Phase2C11) process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi") -process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff") +process.load("Configuration.Geometry.GeometryExtendedRun4D110Reco_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("Configuration.EventContent.EventContent_cff") process.load('Configuration.StandardSequences.Generator_cff') diff --git a/SimG4CMS/Calo/test/python/runHGC8_cfg.py b/SimG4CMS/Calo/test/python/runHGC8_cfg.py index a5cc891404cc4..c6de2b207cc3a 100644 --- a/SimG4CMS/Calo/test/python/runHGC8_cfg.py +++ b/SimG4CMS/Calo/test/python/runHGC8_cfg.py @@ -4,7 +4,7 @@ process = cms.Process("PROD",Phase2C11) process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi") -process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff") +process.load("Configuration.Geometry.GeometryExtendedRun4D110Reco_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("Configuration.EventContent.EventContent_cff") process.load('Configuration.StandardSequences.Generator_cff') diff --git a/SimG4CMS/Calo/test/python/testHGCalGuardRing_cfg.py b/SimG4CMS/Calo/test/python/testHGCalGuardRing_cfg.py index 75606ad617ebe..437cee6ebbcce 100644 --- a/SimG4CMS/Calo/test/python/testHGCalGuardRing_cfg.py +++ b/SimG4CMS/Calo/test/python/testHGCalGuardRing_cfg.py @@ -4,7 +4,7 @@ process = cms.Process("HGCalGuardRingTest",Phase2C17I13M9) process.load("SimGeneral.HepPDTESSource.pdt_cfi") -process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff") +process.load("Configuration.Geometry.GeometryExtendedRun4D110Reco_cff") process.load('FWCore.MessageService.MessageLogger_cfi') if hasattr(process,'MessageLogger'): diff --git a/SimG4CMS/Calo/test/python/testHGCalMouseBite_cfg.py b/SimG4CMS/Calo/test/python/testHGCalMouseBite_cfg.py index 9319d3444ab77..e4f9bb3c045e0 100644 --- a/SimG4CMS/Calo/test/python/testHGCalMouseBite_cfg.py +++ b/SimG4CMS/Calo/test/python/testHGCalMouseBite_cfg.py @@ -22,13 +22,13 @@ #################################################################### # Use the options if (options.type == "V18"): - geomFile = "Configuration.Geometry.GeometryExtended2026D104_cff" + geomFile = "Configuration.Geometry.GeometryExtendedRun4D104_cff" elif (options.type == "V17Shift"): geomFile = "Geometry.HGCalCommonData.testHGCal" + options.type + "Reco_cff" elif (options.type == "V16"): - geomFile = "Configuration.Geometry.GeometryExtended2026D100_cff" + geomFile = "Configuration.Geometry.GeometryExtendedRun4D100_cff" else: - geomFile = "Configuration.Geometry.GeometryExtended2026D110_cff" + geomFile = "Configuration.Geometry.GeometryExtendedRun4D110_cff" print("Geometry file: ", geomFile) diff --git a/SimG4CMS/Forward/test/python/runMTDSens_DD4hep_cfg.py b/SimG4CMS/Forward/test/python/runMTDSens_DD4hep_cfg.py index ed22b5e9ff9f9..762f2cead99d9 100644 --- a/SimG4CMS/Forward/test/python/runMTDSens_DD4hep_cfg.py +++ b/SimG4CMS/Forward/test/python/runMTDSens_DD4hep_cfg.py @@ -4,7 +4,7 @@ from Configuration.ProcessModifiers.dd4hep_cff import dd4hep process = cms.Process('G4PrintGeometry',Phase2C17I13M9,dd4hep) -process.load('Configuration.Geometry.GeometryDD4hepExtended2026D110Reco_cff') +process.load('Configuration.Geometry.GeometryDD4hepExtendedRun4D110Reco_cff') process.load('FWCore.MessageService.MessageLogger_cfi') process.load("FWCore.MessageLogger.MessageLogger_cfi") diff --git a/SimG4CMS/Forward/test/python/runMTDSens_cfg.py b/SimG4CMS/Forward/test/python/runMTDSens_cfg.py index 4cf137a28ea35..9b6fa7ea13759 100644 --- a/SimG4CMS/Forward/test/python/runMTDSens_cfg.py +++ b/SimG4CMS/Forward/test/python/runMTDSens_cfg.py @@ -3,7 +3,7 @@ from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) -process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff') process.load('FWCore.MessageService.MessageLogger_cfi') process.load("FWCore.MessageLogger.MessageLogger_cfi") diff --git a/SimG4Core/PrintGeomInfo/test/python/g4DumpGeometry_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4DumpGeometry_cfg.py index 691fdf90626ec..cf988f96b8ceb 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4DumpGeometry_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4DumpGeometry_cfg.py @@ -5,8 +5,8 @@ #process.load('Configuration.Geometry.GeometryExtended2015Reco_cff') process.load('Configuration.Geometry.GeometryExtended2017Reco_cff') #process.load('Configuration.Geometry.GeometryExtended2021Reco_cff') -#process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff') -#process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff') +#process.load('Configuration.Geometry.GeometryExtendedRun4D77Reco_cff') +#process.load('Configuration.Geometry.GeometryExtendedRun4D83Reco_cff') from SimG4Core.PrintGeomInfo.g4TestGeometry_cfi import * process = checkOverlap(process) diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckCalo_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckCalo_cfg.py index 4f9145ddcbfb0..fd49a8bfb027f 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckCalo_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckCalo_cfg.py @@ -37,57 +37,57 @@ if (options.geometry == "2026D102"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D102Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D102Reco_cff') baseName = 'Hcal2026D102' elif (options.geometry == "2026D103"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D103Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D103Reco_cff') baseName = 'Hcal2026D103' elif (options.geometry == "2026D104"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D104Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D104Reco_cff') baseName = 'Hcal2026D104' elif (options.geometry == "2026D108"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D108' elif (options.geometry == "2026D109"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D109Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D109Reco_cff') baseName = 'Hcal2026D109' elif (options.geometry == "2026D110"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D110' elif (options.geometry == "2026D111"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D111' elif (options.geometry == "2026D112"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D112' elif (options.geometry == "2026D113"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D113' elif (options.geometry == "2026D114"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D114' elif (options.geometry == "2026D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 process = cms.Process('G4PrintGeometry',Phase2C20I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D115' elif (options.geometry == "2016"): from Configuration.Eras.Era_Run2_2016_cff import Run2_2016 diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckEcal_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckEcal_cfg.py index 1fe664119aa95..720b8fc367044 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckEcal_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckEcal_cfg.py @@ -37,57 +37,57 @@ if (options.geometry == "2026D102"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D102Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D102Reco_cff') baseName = 'Hcal2026D102' elif (options.geometry == "2026D103"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D103Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D103Reco_cff') baseName = 'Hcal2026D103' elif (options.geometry == "2026D104"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D104Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D104Reco_cff') baseName = 'Hcal2026D104' elif (options.geometry == "2026D108"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D108' elif (options.geometry == "2026D109"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D109Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D109Reco_cff') baseName = 'Hcal2026D109' elif (options.geometry == "2026D110"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D110' elif (options.geometry == "2026D111"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D111' elif (options.geometry == "2026D112"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D112' elif (options.geometry == "2026D113"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D113' elif (options.geometry == "2026D114"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D114' elif (options.geometry == "2026D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 process = cms.Process('G4PrintGeometry',Phase2C20I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D115' elif (options.geometry == "2016"): from Configuration.Eras.Era_Run2_2016_cff import Run2_2016 diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckMuon_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckMuon_cfg.py index 44f91400ad8c6..d0227771dc311 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckMuon_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckMuon_cfg.py @@ -37,57 +37,57 @@ if (options.geometry == "2026D102"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D102Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D102Reco_cff') baseName = 'Hcal2026D102' elif (options.geometry == "2026D103"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D103Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D103Reco_cff') baseName = 'Hcal2026D103' elif (options.geometry == "2026D104"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D104Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D104Reco_cff') baseName = 'Hcal2026D104' elif (options.geometry == "2026D108"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D108' elif (options.geometry == "2026D109"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D109Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D109Reco_cff') baseName = 'Hcal2026D109' elif (options.geometry == "2026D110"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D110' elif (options.geometry == "2026D111"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D111' elif (options.geometry == "2026D112"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D112' elif (options.geometry == "2026D113"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D113' elif (options.geometry == "2026D114"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D114' elif (options.geometry == "2026D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 process = cms.Process('G4PrintGeometry',Phase2C20I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D115' elif (options.geometry == "2016"): from Configuration.Eras.Era_Run2_2016_cff import Run2_2016 diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckRun4DD4hep_cfg.py similarity index 100% rename from SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py rename to SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckRun4DD4hep_cfg.py diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckRun4DDD_cfg.py similarity index 100% rename from SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py rename to SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckRun4DDD_cfg.py diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckTracker_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckTracker_cfg.py index 67de13530cd6b..0dededed89ecc 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckTracker_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckTracker_cfg.py @@ -37,57 +37,57 @@ if (options.geometry == "2026D102"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D102Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D102Reco_cff') baseName = 'Hcal2026D102' elif (options.geometry == "2026D103"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D103Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D103Reco_cff') baseName = 'Hcal2026D103' elif (options.geometry == "2026D104"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D104Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D104Reco_cff') baseName = 'Hcal2026D104' elif (options.geometry == "2026D108"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D108' elif (options.geometry == "2026D109"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D109Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D109Reco_cff') baseName = 'Hcal2026D109' elif (options.geometry == "2026D110"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D110' elif (options.geometry == "2026D111"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D111' elif (options.geometry == "2026D112"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D112' elif (options.geometry == "2026D113"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('G4PrintGeometry',Phase2C22I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D113' elif (options.geometry == "2026D114"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D114' elif (options.geometry == "2026D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 process = cms.Process('G4PrintGeometry',Phase2C20I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') baseName = 'Hcal2026D115' elif (options.geometry == "2016"): from Configuration.Eras.Era_Run2_2016_cff import Run2_2016 diff --git a/SimG4Core/PrintGeomInfo/test/python/runDD4hep2026D98_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDD4hepRun4D98_cfg.py similarity index 100% rename from SimG4Core/PrintGeomInfo/test/python/runDD4hep2026D98_cfg.py rename to SimG4Core/PrintGeomInfo/test/python/runDD4hepRun4D98_cfg.py diff --git a/SimG4Core/PrintGeomInfo/test/python/runDD4hep2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDD4hepRun4_cfg.py similarity index 100% rename from SimG4Core/PrintGeomInfo/test/python/runDD4hep2026_cfg.py rename to SimG4Core/PrintGeomInfo/test/python/runDD4hepRun4_cfg.py diff --git a/SimG4Core/PrintGeomInfo/test/python/runDDD2026D98_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDDDRun4D98_cfg.py similarity index 98% rename from SimG4Core/PrintGeomInfo/test/python/runDDD2026D98_cfg.py rename to SimG4Core/PrintGeomInfo/test/python/runDDDRun4D98_cfg.py index 1153340eb7fde..6556b1d2530fd 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runDDD2026D98_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runDDDRun4D98_cfg.py @@ -29,7 +29,7 @@ from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('G4PrintGeometry',Phase2C17I13M9) -geomFile = "Geometry.CMSCommonData.GeometryExtended2026D98" + options.type + "Reco_cff" +geomFile = "Geometry.CMSCommonData.GeometryExtendedRun4D98" + options.type + "Reco_cff" materialFileName = "matfileD98" + options.type + "DDD.txt" solidFileName = "solidfileD98" + options.type + "DDD.txt" lvFileName = "lvfileD98" + options.type + "DDD.txt" diff --git a/SimG4Core/PrintGeomInfo/test/python/runDDD2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDDDRun4_cfg.py similarity index 100% rename from SimG4Core/PrintGeomInfo/test/python/runDDD2026_cfg.py rename to SimG4Core/PrintGeomInfo/test/python/runDDDRun4_cfg.py diff --git a/SimG4Core/PrintGeomInfo/test/python/runMaterialBudgeInfo2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runMaterialBudgeInfoRun4_cfg.py similarity index 100% rename from SimG4Core/PrintGeomInfo/test/python/runMaterialBudgeInfo2026_cfg.py rename to SimG4Core/PrintGeomInfo/test/python/runMaterialBudgeInfoRun4_cfg.py diff --git a/SimG4Core/PrintGeomInfo/test/python/runPrintG4Touch2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runPrintG4TouchRun4_cfg.py similarity index 100% rename from SimG4Core/PrintGeomInfo/test/python/runPrintG4Touch2026_cfg.py rename to SimG4Core/PrintGeomInfo/test/python/runPrintG4TouchRun4_cfg.py diff --git a/SimG4Core/PrintGeomInfo/test/python/runPrintSolid2026D98_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runPrintSolidRun4D98_cfg.py similarity index 98% rename from SimG4Core/PrintGeomInfo/test/python/runPrintSolid2026D98_cfg.py rename to SimG4Core/PrintGeomInfo/test/python/runPrintSolidRun4D98_cfg.py index 79d9d1235d28a..61461bb4e881e 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runPrintSolid2026D98_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runPrintSolidRun4D98_cfg.py @@ -36,7 +36,7 @@ if (options.type == "DDD"): process = cms.Process('G4PrintGeometry',Phase2C17I13M9) - geomFile = "Geometry.CMSCommonData.GeometryExtended2026D98" + options.detector + "Reco_cff" + geomFile = "Geometry.CMSCommonData.GeometryExtendedRun4D98" + options.detector + "Reco_cff" process.load(geomFile) else: from Configuration.ProcessModifiers.dd4hep_cff import dd4hep diff --git a/SimG4Core/PrintGeomInfo/test/python/runPrintSolid2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runPrintSolidRun4_cfg.py similarity index 100% rename from SimG4Core/PrintGeomInfo/test/python/runPrintSolid2026_cfg.py rename to SimG4Core/PrintGeomInfo/test/python/runPrintSolidRun4_cfg.py diff --git a/SimG4Core/PrintGeomInfo/test/python/runSens2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runSensRun4_cfg.py similarity index 100% rename from SimG4Core/PrintGeomInfo/test/python/runSens2026_cfg.py rename to SimG4Core/PrintGeomInfo/test/python/runSensRun4_cfg.py diff --git a/SimG4Core/PrintGeomInfo/test/python/runSummary2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runSummaryRun4_cfg.py similarity index 100% rename from SimG4Core/PrintGeomInfo/test/python/runSummary2026_cfg.py rename to SimG4Core/PrintGeomInfo/test/python/runSummaryRun4_cfg.py diff --git a/SimTracker/TrackerMaterialAnalysis/test/dumpFullXML_ForPhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/dumpFullXML_ForPhaseII.py index 52f3c0069c6ca..fb0e95e47d59c 100644 --- a/SimTracker/TrackerMaterialAnalysis/test/dumpFullXML_ForPhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/dumpFullXML_ForPhaseII.py @@ -30,7 +30,7 @@ def checkEnvironment(): sys.exit(CMSSW_NOT_SET) def getTrackerRecoMaterialCopy(filename): - # path of trackerRecoMaterial as defined in this cfi (for 2026D41) : Geometry/CMSCommonData/python/cmsExtendedGeometry2026D41XML_cfi.py + # path of trackerRecoMaterial as defined in this cfi (for 2026D41) : Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D41XML_cfi.py tracker_reco_material = os.path.join(os.environ['CMSSW_BASE'], 'src/Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613/trackerRecoMaterial.xml') if not os.path.exists(tracker_reco_material): diff --git a/SimTracker/TrackerMaterialAnalysis/test/listGroups.py b/SimTracker/TrackerMaterialAnalysis/test/listGroups.py old mode 100755 new mode 100644 index 38e1417a21c6b..d7c7fdac0e255 --- a/SimTracker/TrackerMaterialAnalysis/test/listGroups.py +++ b/SimTracker/TrackerMaterialAnalysis/test/listGroups.py @@ -17,7 +17,7 @@ # Add our custom detector grouping to DDD process.XMLIdealGeometryESSource.geomXMLFiles.extend(['SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml']) elif options.geometry == 'Phase2': - process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D41Reco_cff') # Add our custom detector grouping to DDD process.XMLIdealGeometryESSource.geomXMLFiles.extend(['SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseII.xml']) else: diff --git a/SimTracker/TrackerMaterialAnalysis/test/listIds_PhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/listIds_PhaseII.py old mode 100755 new mode 100644 index 1e64f1c5e91dd..88408ef41a351 --- a/SimTracker/TrackerMaterialAnalysis/test/listIds_PhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/listIds_PhaseII.py @@ -28,7 +28,7 @@ from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, _PH2_GLOBAL_TAG, '') else: - process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff') process.trackerGeometry.applyAlignment = False # needed to avoid to pass the Global Position Record process.load('FWCore.MessageService.MessageLogger_cfi') diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHFNosePhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHFNosePhaseII.py index e434ed5b0120c..89c6e54713460 100644 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHFNosePhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHFNosePhaseII.py @@ -16,7 +16,7 @@ from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') else: - process.load('Configuration.Geometry.GeometryExtended2026D44Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D44Reco_cff') process.load('FWCore.MessageService.MessageLogger_cfi') diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHGCalPhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHGCalPhaseII.py index 01e0c1f7c7b49..4016386253e0c 100644 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHGCalPhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHGCalPhaseII.py @@ -16,7 +16,7 @@ from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') else: - process.load('Configuration.Geometry.GeometryExtended2026D46Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D46Reco_cff') process.load('FWCore.MessageService.MessageLogger_cfi') diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseII.py old mode 100755 new mode 100644 index 1b32df6fa0032..f73fd1f9c4596 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseII.py @@ -28,7 +28,7 @@ from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, _PH2_GLOBAL_TAG, '') else: - process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff') process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.files.LogTrackingMaterialAnalysis = dict() diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHFNosePhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHFNosePhaseII.py old mode 100755 new mode 100644 index 84eeed850d9e2..b9173c0c75582 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHFNosePhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHFNosePhaseII.py @@ -12,7 +12,7 @@ # only a temporary hack, since the material description has # been updated in release via XML and the DB is behind. if not readGeometryFromDB: - process.load('Configuration.Geometry.GeometryExtended2026D82Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D82Reco_cff') else: # GlobalTag and geometry via GT process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHGCalPhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHGCalPhaseII.py old mode 100755 new mode 100644 index 2aed9f1825aec..780473bf974c0 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHGCalPhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHGCalPhaseII.py @@ -12,7 +12,7 @@ # only a temporary hack, since the material description has # been updated in release via XML and the DB is behind. if not readGeometryFromDB: - process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D86Reco_cff') else: # GlobalTag and geometry via GT process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseII.py old mode 100755 new mode 100644 index 75542c747277b..df83812a2eead --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseII.py @@ -58,7 +58,7 @@ from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, _PH2_GLOBAL_TAG, '') else: - process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(options.nEvents) diff --git a/Validation/HGCalValidation/scripts/testHGCalMTRecoStudy_cfg.py b/Validation/HGCalValidation/scripts/testHGCalMTRecoStudy_cfg.py index 65c6efd951d9c..f697a727d8d62 100644 --- a/Validation/HGCalValidation/scripts/testHGCalMTRecoStudy_cfg.py +++ b/Validation/HGCalValidation/scripts/testHGCalMTRecoStudy_cfg.py @@ -42,17 +42,17 @@ if (options.geometry == "D105"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('HGCalMTReco',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D105Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D105Reco_cff') outputFile = 'file:recoutputD105.root' elif (options.geometry == "D114"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('HGCalMTReco',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D114Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D114Reco_cff') outputFile = 'file:recoutputD114.root' elif (options.geometry == "D110"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('HGCalMTReco',Phase2C17I13M9) - process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') + process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff') outputFile = 'file:recoutputD110.root' else: print("Please select a valid geometry version e.g. D105, D110, D114....") diff --git a/Validation/HGCalValidation/test/HeterogeneousHGCalRecHitsValidator_cfg.py b/Validation/HGCalValidation/test/HeterogeneousHGCalRecHitsValidator_cfg.py index 0fb974b588c58..66a17c3ebb783 100644 --- a/Validation/HGCalValidation/test/HeterogeneousHGCalRecHitsValidator_cfg.py +++ b/Validation/HGCalValidation/test/HeterogeneousHGCalRecHitsValidator_cfg.py @@ -41,7 +41,7 @@ def getHeterogeneousRecHitsSource(pu): process.load('Configuration.StandardSequences.MagneticField_cff') #process.load('Configuration.EventContent.EventContent_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D49Reco_cff') process.load('HeterogeneousCore.CUDACore.ProcessAcceleratorCUDA_cfi') process.load('RecoLocalCalo.HGCalRecProducers.HGCalRecHit_cfi') process.load('SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi') diff --git a/Validation/HGCalValidation/test/python/runHFNoseDigiStudy_cfg.py b/Validation/HGCalValidation/test/python/runHFNoseDigiStudy_cfg.py index 85ab42988f883..4c1ed21ce0a0a 100644 --- a/Validation/HGCalValidation/test/python/runHFNoseDigiStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHFNoseDigiStudy_cfg.py @@ -4,7 +4,7 @@ process = cms.Process('PROD',Phase2C20I13M9) process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") -process.load('Configuration.Geometry.GeometryExtended2026D115Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D115Reco_cff') process.load("Configuration.StandardSequences.MagneticField_cff") process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.StandardSequences.RawToDigi_cff') diff --git a/Validation/HGCalValidation/test/python/runHFNoseRecHitStudy_cfg.py b/Validation/HGCalValidation/test/python/runHFNoseRecHitStudy_cfg.py index 54955094aea88..ae091613a672f 100644 --- a/Validation/HGCalValidation/test/python/runHFNoseRecHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHFNoseRecHitStudy_cfg.py @@ -4,7 +4,7 @@ from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 process = cms.Process('PROD',Phase2C20I13M9) -process.load('Configuration.Geometry.GeometryExtended2026D115Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D115Reco_cff') process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Services_cff') diff --git a/Validation/HGCalValidation/test/python/runHFNoseSimHitStudy_cfg.py b/Validation/HGCalValidation/test/python/runHFNoseSimHitStudy_cfg.py index c8f4c890b8760..2921e0003c288 100644 --- a/Validation/HGCalValidation/test/python/runHFNoseSimHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHFNoseSimHitStudy_cfg.py @@ -5,7 +5,7 @@ process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi") -process.load('Configuration.Geometry.GeometryExtended2026D115_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D115_cff') process.load("Configuration.StandardSequences.MagneticField_cff") process.load("Configuration.EventContent.EventContent_cff") process.load('FWCore.MessageService.MessageLogger_cfi') diff --git a/Validation/HGCalValidation/test/python/standalone_fromRECO.py b/Validation/HGCalValidation/test/python/standalone_fromRECO.py index 59babc3a46ea3..2272bf686dae9 100644 --- a/Validation/HGCalValidation/test/python/standalone_fromRECO.py +++ b/Validation/HGCalValidation/test/python/standalone_fromRECO.py @@ -7,7 +7,7 @@ process.load('Configuration.StandardSequences.Services_cff') process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') -process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.maxEvents = cms.untracked.PSet( diff --git a/Validation/HGCalValidation/test/python/standalone_fromRECO_HARVESTING.py b/Validation/HGCalValidation/test/python/standalone_fromRECO_HARVESTING.py index 0de8b58f9f867..123084a20d23d 100644 --- a/Validation/HGCalValidation/test/python/standalone_fromRECO_HARVESTING.py +++ b/Validation/HGCalValidation/test/python/standalone_fromRECO_HARVESTING.py @@ -8,7 +8,7 @@ process.load('Configuration.StandardSequences.Services_cff') process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') -process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff') process.load('Configuration.StandardSequences.DQMSaverAtRunEnd_cff') process.load('Configuration.StandardSequences.Harvesting_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') diff --git a/Validation/HGCalValidation/test/python/standalone_onlyTICL_HARVESTING.py b/Validation/HGCalValidation/test/python/standalone_onlyTICL_HARVESTING.py index 61e0ecc98153f..42d9655579e58 100644 --- a/Validation/HGCalValidation/test/python/standalone_onlyTICL_HARVESTING.py +++ b/Validation/HGCalValidation/test/python/standalone_onlyTICL_HARVESTING.py @@ -20,7 +20,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.DQMSaverAtRunEnd_cff') process.load('Configuration.StandardSequences.Harvesting_cff') diff --git a/Validation/HGCalValidation/test/python/standalone_onlyTICL_fromRECO.py b/Validation/HGCalValidation/test/python/standalone_onlyTICL_fromRECO.py index c7143ea33605d..dac4d84cf0c9e 100644 --- a/Validation/HGCalValidation/test/python/standalone_onlyTICL_fromRECO.py +++ b/Validation/HGCalValidation/test/python/standalone_onlyTICL_fromRECO.py @@ -22,7 +22,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.RawToDigi_cff') process.load('Configuration.StandardSequences.L1Reco_cff') diff --git a/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py b/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py index 35517d676cd77..a24aa20474330 100644 --- a/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py @@ -10,7 +10,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D115Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D115Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV16_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV16_cfg.py index e5916a76ae99b..f931de2bce7c0 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV16_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV16_cfg.py @@ -9,8 +9,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D100Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D100_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D100Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D100_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic50ns13TeVCollision_cfi') diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17N_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17N_cfg.py index ea0f8f9ab7b0d..89b0ba6f31f6d 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17N_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17N_cfg.py @@ -9,7 +9,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic50ns13TeVCollision_cfi') diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17_cfg.py index d0603e11202c2..52e138a61d727 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17_cfg.py @@ -9,7 +9,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic50ns13TeVCollision_cfi') diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV18_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV18_cfg.py index 722f681a2e1d5..804910c27275b 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV18_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV18_cfg.py @@ -9,7 +9,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D104Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D104Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic50ns13TeVCollision_cfi') diff --git a/Validation/HGCalValidation/test/python/testValidationHGCalTrigPrim_RelVal_cfg.py b/Validation/HGCalValidation/test/python/testValidationHGCalTrigPrim_RelVal_cfg.py index b67964d290515..6ece32171e69d 100644 --- a/Validation/HGCalValidation/test/python/testValidationHGCalTrigPrim_RelVal_cfg.py +++ b/Validation/HGCalValidation/test/python/testValidationHGCalTrigPrim_RelVal_cfg.py @@ -16,8 +16,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D110_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D110_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/Validation/RecoEgamma/test/ElectronMcFakePostValidation_cfg.py b/Validation/RecoEgamma/test/ElectronMcFakePostValidation_cfg.py index 331477a5194dc..0ac746f658b77 100644 --- a/Validation/RecoEgamma/test/ElectronMcFakePostValidation_cfg.py +++ b/Validation/RecoEgamma/test/ElectronMcFakePostValidation_cfg.py @@ -43,7 +43,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D76Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D76Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.DQMSaverAtRunEnd_cff') process.load('Configuration.StandardSequences.Harvesting_cff') diff --git a/Validation/RecoEgamma/test/ElectronMcSignalPostValidationMiniAOD_cfg.py b/Validation/RecoEgamma/test/ElectronMcSignalPostValidationMiniAOD_cfg.py index a52d3e6f18e05..1970fedc218b7 100644 --- a/Validation/RecoEgamma/test/ElectronMcSignalPostValidationMiniAOD_cfg.py +++ b/Validation/RecoEgamma/test/ElectronMcSignalPostValidationMiniAOD_cfg.py @@ -42,7 +42,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -#process.load('Configuration.Geometry.GeometryExtended2026D76Reco_cff') +#process.load('Configuration.Geometry.GeometryExtendedRun4D76Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.DQMSaverAtRunEnd_cff') process.load('Configuration.StandardSequences.Harvesting_cff') diff --git a/Validation/RecoEgamma/test/ElectronMcSignalPostValidationPt1000_cfg.py b/Validation/RecoEgamma/test/ElectronMcSignalPostValidationPt1000_cfg.py index fd71ad50252b8..4c241002134a7 100644 --- a/Validation/RecoEgamma/test/ElectronMcSignalPostValidationPt1000_cfg.py +++ b/Validation/RecoEgamma/test/ElectronMcSignalPostValidationPt1000_cfg.py @@ -40,7 +40,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D76Reco_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D76Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.DQMSaverAtRunEnd_cff') process.load('Configuration.StandardSequences.Harvesting_cff') diff --git a/Validation/RecoEgamma/test/ElectronMcSignalPostValidation_cfg.py b/Validation/RecoEgamma/test/ElectronMcSignalPostValidation_cfg.py index 431868fcb86e8..4947323abe582 100644 --- a/Validation/RecoEgamma/test/ElectronMcSignalPostValidation_cfg.py +++ b/Validation/RecoEgamma/test/ElectronMcSignalPostValidation_cfg.py @@ -40,7 +40,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -#process.load('Configuration.Geometry.GeometryExtended2026D76Reco_cff') +#process.load('Configuration.Geometry.GeometryExtendedRun4D76Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.DQMSaverAtRunEnd_cff') process.load('Configuration.StandardSequences.Harvesting_cff')