Squashed commit of the following:

commit 50b3133 Author: Norraphat <srimanob@mail.cern.ch> Date: Sat Nov 2 16:28:46 2024 +0100 fix 7: geometry check unittest commit 6a2149a Author: Norraphat <srimanob@mail.cern.ch> Date: Sat Nov 2 11:27:49 2024 +0100 fix 6: unittest commit 8bf2f5f Author: Norraphat <srimanob@mail.cern.ch> Date: Sat Nov 2 08:46:47 2024 +0100 fix 5: dd4hep and unittest commit fccd44c Author: Norraphat <srimanob@mail.cern.ch> Date: Sat Nov 2 02:20:34 2024 +0100 fix 4: runTheMatrix commit de59c0b Author: Norraphat <srimanob@mail.cern.ch> Date: Sat Nov 2 01:23:45 2024 +0100 fix 3: runTheMatrix commit 653062d Author: Norraphat <srimanob@mail.cern.ch> Date: Sat Nov 2 00:53:17 2024 +0100 fix 2 commit bcd9457 Author: Norraphat <srimanob@mail.cern.ch> Date: Sat Nov 2 00:37:15 2024 +0100 fix 1 commit 81d9a01 Author: Norraphat <srimanob@mail.cern.ch> Date: Sat Nov 2 00:32:46 2024 +0100 remove obsolete files commit 784fbdd Author: Norraphat <srimanob@mail.cern.ch> Date: Sat Nov 2 00:21:19 2024 +0100 update-1
cms-sw · Nov 5, 2024 · 8f41eb9 · 8f41eb9
1 parent d08538a
commit 8f41eb9
Show file tree

Hide file tree

Showing 389 changed files with 2,452 additions and 2,836 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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