Skip to content

Commit b156398

Browse files
cmsbuildcmsbuild
authored
Merge pull request #46582 from srimanob/142_Rename2026toRun4
Rename Phase-2 "2026" geometries and workflows to "Run4"
2 parents d08538a + 8f41eb9 commit b156398

File tree

389 files changed

+2452
-2836
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

389 files changed

+2452
-2836
lines changed

‎Alignment/OfflineValidation/test/inspectData_cfg.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
from Configuration.PyReleaseValidation.upgradeWorkflowComponents import upgradeProperties
7070
ConditionsInfo = {}
7171
if 'D' in options.Detector:
72-
ConditionsInfo = upgradeProperties[2026][options.Detector] # so if the default changes, change wf only here
72+
ConditionsInfo = upgradeProperties['Run4'][options.Detector] # so if the default changes, change wf only here
7373
else:
7474
ConditionsInfo = upgradeProperties[2017][options.Detector]
7575

‎Alignment/OfflineValidation/test/testPrimaryVertexRelatedValidations_cfg.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class RefitType(Enum):
109109
# Standard loads
110110
###################################################################
111111
if(options.isPhase2):
112-
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
112+
process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff')
113113
else:
114114
process.load("Configuration.Geometry.GeometryRecoDB_cff")
115115

‎Alignment/OfflineValidation/test/test_all_Phase2_cfg.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class RefitType(Enum):
8181
# Standard loads
8282
###################################################################
8383
#process.load("Configuration.Geometry.GeometryRecoDB_cff")
84-
process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff')
84+
process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff')
8585

8686
####################################################################
8787
# Get the BeamSpot

‎Alignment/OfflineValidation/test/testingScripts/test_unitMiscellanea.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ echo "TESTING inspect ALCARECO data ..."
55
cmsRun ${CMSSW_BASE}/src/Alignment/OfflineValidation/test/inspectData_cfg.py unitTest=True isCosmics=True trackCollection=ALCARECOTkAlCosmicsCTF0T || die "Failure running inspectData_cfg.py" $?
66

77
echo "TESTING inspect Phase2 ALCARECO data ..."
8-
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" $?
8+
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" $?
99

1010
echo "TESTING G4e refitter ..."
1111
cmsRun ${CMSSW_BASE}/src/Alignment/OfflineValidation/test/testG4Refitter_cfg.py maxEvents=10 || die "Failure running testG4Refitter_cfg.py" $?

‎Alignment/TrackerAlignment/test/Misalignments/createRandomlyMisalignedGeometry_Phase2_cfg.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
###################################################################
4949
# Ideal geometry producer and standard includes
5050
###################################################################
51-
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
51+
process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff')
5252
process.trackerGeometry.applyAlignment = True
5353

5454
###################################################################

‎Alignment/TrackerAlignment/test/createTrackerAlignmentRcds_Phase2_cfg.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
process.load("Configuration.StandardSequences.MagneticField_cff") # B-field map
2424
if(options.Scenario == _settings.DEFAULT_VERSION):
2525
print("Loading default scenario: ", _settings.DEFAULT_VERSION)
26-
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
26+
process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff')
2727
else:
2828
process.load('Configuration.Geometry.GeometryExtended'+options.Scenario+'Reco_cff')
2929
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") # Global tag

‎CalibCalorimetry/HcalPlugins/test/hbhedarkeninganalyzer_cfg.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
process.load("Configuration.StandardSequences.Services_cff")
99
process.load("Configuration.Geometry.GeometryExtended2018Reco_cff")
10-
#process.load("Configuration.Geometry.GeometryExtended2026D49Reco_cff")
10+
#process.load("Configuration.Geometry.GeometryExtendedRun4D49Reco_cff")
1111
process.load("CalibCalorimetry.HcalPlugins.HBHEDarkening_cff")
1212

1313
import CalibCalorimetry.HcalPlugins.Hcal_Conditions_forGlobalTag_cff

‎CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelBuilder_cfg.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
)
2525

2626
## specify the default phase2 detector
27-
process.load("Configuration.Geometry.GeometryExtended2026Default_cff")
28-
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
27+
process.load("Configuration.Geometry.GeometryExtendedRun4Default_cff")
28+
process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff')
2929

3030
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
3131
from Configuration.AlCa.GlobalTag import GlobalTag

‎CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelReader_cfg.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
# Input data
5555
###################################################################
5656
if(options.fromESSource):
57-
process.load("Configuration.Geometry.GeometryExtended2026Default_cff")
58-
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
57+
process.load("Configuration.Geometry.GeometryExtendedRun4Default_cff")
58+
process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff')
5959
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
6060
from Configuration.AlCa.GlobalTag import GlobalTag
6161
process.GlobalTag = GlobalTag(process.GlobalTag, _PH2_GLOBAL_TAG, '')

‎CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleReader_cfg.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
# Input data
5454
###################################################################
5555
if(options.fromESSource):
56-
process.load("Configuration.Geometry.GeometryExtended2026Default_cff")
57-
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
56+
process.load("Configuration.Geometry.GeometryExtendedRun4Default_cff")
57+
process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff')
5858
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
5959
from Configuration.AlCa.GlobalTag import GlobalTag
6060
process.GlobalTag = GlobalTag(process.GlobalTag, _PH2_GLOBAL_TAG, '')

‎CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
process.load("CondCore.CondDB.CondDB_cfi")
4545
process.CondDB.connect = cms.string(outdb)
4646

47-
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
48-
process.load('Configuration.Geometry.GeometryExtended2026Default_cff')
47+
process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff')
48+
process.load('Configuration.Geometry.GeometryExtendedRun4Default_cff')
4949

5050
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
5151
from Configuration.AlCa.GlobalTag import GlobalTag

‎CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@
186186
process.load("FWCore.MessageService.MessageLogger_cfi")
187187
process.MessageLogger = cms.Service("MessageLogger",
188188
destinations = cms.untracked.vstring('SiPixel2DTemplateDBObjectUploader_Phase2.log'))
189-
process.load('Configuration.Geometry.GeometryExtended2026D110_cff')
190-
process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff')
189+
process.load('Configuration.Geometry.GeometryExtendedRun4D110_cff')
190+
process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff')
191191
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
192192
from Configuration.AlCa.GlobalTag import GlobalTag
193193
process.GlobalTag = GlobalTag(process.GlobalTag, options.GlobalTag, '')

‎CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -179,25 +179,25 @@
179179
recoGeometry_cff = ''
180180
tGeometry = options.geometry
181181
if tGeometry == 'T5':
182-
geometry_cff = 'GeometryExtended2026D17_cff'
183-
recoGeometry_cff = 'GeometryExtended2026D17Reco_cff'
182+
geometry_cff = 'GeometryExtendedRun4D17_cff'
183+
recoGeometry_cff = 'GeometryExtendedRun4D17Reco_cff'
184184
LA_value = 0.106
185185
tag = 'SiPixelLorentzAngle_Phase2_T5'
186186
elif tGeometry == 'T6':
187-
geometry_cff = 'GeometryExtended2026D35_cff'
188-
recoGeometry_cff = 'GeometryExtended2026D35Reco_cff'
187+
geometry_cff = 'GeometryExtendedRun4D35_cff'
188+
recoGeometry_cff = 'GeometryExtendedRun4D35Reco_cff'
189189
elif tGeometry == 'T14':
190-
geometry_cff = 'GeometryExtended2026D43_cff'
191-
recoGeometry_cff = 'GeometryExtended2026D43Reco_cff'
190+
geometry_cff = 'GeometryExtendedRun4D43_cff'
191+
recoGeometry_cff = 'GeometryExtendedRun4D43Reco_cff'
192192
elif tGeometry == 'T15':
193-
geometry_cff = 'GeometryExtended2026D49_cff'
194-
recoGeometry_cff = 'GeometryExtended2026D49Reco_cff'
193+
geometry_cff = 'GeometryExtendedRun4D49_cff'
194+
recoGeometry_cff = 'GeometryExtendedRun4D49Reco_cff'
195195
elif tGeometry == 'T21':
196-
geometry_cff = 'GeometryExtended2026D88_cff'
197-
recoGeometry_cff = 'GeometryExtended2026D88Reco_cff'
196+
geometry_cff = 'GeometryExtendedRun4D88_cff'
197+
recoGeometry_cff = 'GeometryExtendedRun4D88Reco_cff'
198198
elif tGeometry == 'T33':
199-
geometry_cff = 'GeometryExtended2026D110_cff'
200-
recoGeometry_cff = 'GeometryExtended2026D110Reco_cff'
199+
geometry_cff = 'GeometryExtendedRun4D110_cff'
200+
recoGeometry_cff = 'GeometryExtendedRun4D110Reco_cff'
201201
else:
202202
print("Unknown tracker geometry")
203203
print("What are you doing ?!?!?!?!")

‎CondTools/SiPixel/test/SiPixelLorentzAngleDBLoader_Phase2_cfg.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@
5858
tag = 'SiPixelLorentzAngle_Phase2_T15'
5959

6060
elif tGeometry == 'T25':
61-
geometry_cff = 'GeometryExtended2026D97_cff'
62-
recoGeometry_cff = 'GeometryExtended2026D97Reco_cff'
61+
geometry_cff = 'GeometryExtendedRun4D97_cff'
62+
recoGeometry_cff = 'GeometryExtendedRun4D97Reco_cff'
6363
has3DinL1 = True
6464
LA_value = 0.0503
6565
tag = 'SiPixelLorentzAngle_Phase2_T25_v1'
6666

6767
elif tGeometry == 'T33':
68-
geometry_cff = 'GeometryExtended2026D102_cff'
69-
recoGeometry_cff = 'GeometryExtended2026D102Reco_cff'
68+
geometry_cff = 'GeometryExtendedRun4D102_cff'
69+
recoGeometry_cff = 'GeometryExtendedRun4D102Reco_cff'
7070
has3DinL1 = True
7171
LA_value = 0.0503
7272
tag = 'SiPixelLorentzAngle_Phase2_T33_v1'

‎CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -184,20 +184,20 @@
184184
LA_value = 0.106
185185
tag = 'SiPixelLorentzAngle_Phase2_T5'
186186
elif tGeometry == 'T6':
187-
geometry_cff = 'GeometryExtended2026D35_cff'
188-
recoGeometry_cff = 'GeometryExtended2026D35Reco_cff'
187+
geometry_cff = 'GeometryExtendedRun4D35_cff'
188+
recoGeometry_cff = 'GeometryExtendedRun4D35Reco_cff'
189189
elif tGeometry == 'T14':
190-
geometry_cff = 'GeometryExtended2026D43_cff'
191-
recoGeometry_cff = 'GeometryExtended2026D43Reco_cff'
190+
geometry_cff = 'GeometryExtendedRun4D43_cff'
191+
recoGeometry_cff = 'GeometryExtendedRun4D43Reco_cff'
192192
elif tGeometry == 'T15':
193-
geometry_cff = 'GeometryExtended2026D49_cff'
194-
recoGeometry_cff = 'GeometryExtended2026D49Reco_cff'
193+
geometry_cff = 'GeometryExtendedRun4D49_cff'
194+
recoGeometry_cff = 'GeometryExtendedRun4D49Reco_cff'
195195
elif tGeometry == 'T21':
196-
geometry_cff = 'GeometryExtended2026D92_cff'
197-
recoGeometry_cff = 'GeometryExtended2026D92Reco_cff'
196+
geometry_cff = 'GeometryExtendedRun4D92_cff'
197+
recoGeometry_cff = 'GeometryExtendedRun4D92Reco_cff'
198198
elif tGeometry == 'T33':
199-
geometry_cff = 'GeometryExtended2026D110_cff'
200-
recoGeometry_cff = 'GeometryExtended2026D110Reco_cff'
199+
geometry_cff = 'GeometryExtendedRun4D110_cff'
200+
recoGeometry_cff = 'GeometryExtendedRun4D110Reco_cff'
201201
else:
202202
print("Unknown tracker geometry")
203203
print("What are you doing ?!?!?!?!")

‎Configuration/Geometry/README.md

+17-17
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ vi python/dict2021Geometry.py
1010
python3 ./scripts/generate2021Geometry.py -D 2021
1111
```
1212
Note:
13-
* For Phase-2, use [generate2026Geometry.py](./scripts/generate2026Geometry.py) and [dict2026Geometry.py](./python/dict2026Geometry.py) instead.
13+
* For Phase-2, use [generateRun4Geometry.py](./scripts/generateRun4Geometry.py) and [dictRun4Geometry.py](./python/dictRun4Geometry.py) instead.
1414
* For the list of geometries, see below.
1515

1616
# Run 3 Geometries
@@ -68,7 +68,7 @@ Several detector combinations have been generated:
6868

6969
# Phase 2 Geometries
7070

71-
The Phase 2 geometries are automatically created using the script [generate2026Geometry.py](./scripts/generate2026Geometry.py).
71+
The Phase 2 geometries are automatically created using the script [generateRun4Geometry.py](./scripts/generateRun4Geometry.py).
7272

7373
Different versions of various subdetectors can be combined. The available versions are:
7474

@@ -91,21 +91,21 @@ Tracker:
9191
* T39: Same as T35 but introducing BigPixels in InnerTracker (1x2 planar and 2x2 planar modules)
9292

9393
Calorimeters:
94-
* C9: HGCal (v11 post TDR HGCal Geometry w/ corner centering for HE part) + Phase2 HCAL and EB + Tracker cables (used in 2026D49)
95-
* C10: HGCal (as in C9) + HFNose with corrected wafer size + Phase2 HCAL and EB (used in 2026D60)
96-
* 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)
97-
* 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)
98-
* 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)
99-
* C15: HGCal (as in C14) + HFNose with corrected wafer size + Phase2 HCAL and EB (used in 2026D82)
100-
* 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)
101-
* 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)
102-
* 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)
103-
* 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)
104-
* C20: HGCal (v17 version of HGCal geometry as in C18) + HFNose with corrected wafer size + Phase2 HCAL and EB (used in 2026D93)
105-
* 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)
106-
* 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)
107-
* 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)
108-
* 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)
94+
* C9: HGCal (v11 post TDR HGCal Geometry w/ corner centering for HE part) + Phase2 HCAL and EB + Tracker cables (used in Run4D49)
95+
* C10: HGCal (as in C9) + HFNose with corrected wafer size + Phase2 HCAL and EB (used in Run4D60)
96+
* 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)
97+
* 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)
98+
* 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)
99+
* C15: HGCal (as in C14) + HFNose with corrected wafer size + Phase2 HCAL and EB (used in Run4D82)
100+
* 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)
101+
* 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)
102+
* 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)
103+
* 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)
104+
* C20: HGCal (v17 version of HGCal geometry as in C18) + HFNose with corrected wafer size + Phase2 HCAL and EB (used in Run4D93)
105+
* 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)
106+
* 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)
107+
* 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)
108+
* 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)
109109

110110
Muon system:
111111
* 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

‎Configuration/Geometry/python/GeometryDD4hepExtended2026D104Reco_cff.py

-61
This file was deleted.

0 commit comments

Comments
 (0)