Skip to content

Commit cb0b142

Browse files
cmsbuildcmsbuild
authored
Merge pull request #46890 from bsunanda/Phase2-gex184
Phase2-gex184 Change directory name 2026 to 2030 to enable future Run3 runs during 2026
2 parents 7011d13 + 97d0c3f commit cb0b142

File tree

185 files changed

+1877
-1424
lines changed

Some content is hidden

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

185 files changed

+1877
-1424
lines changed

‎Configuration/Geometry/python/GeometrySLHCSimDB_cff.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# Ideal geometry, needed for simulation
77
from GeometryReaders.XMLIdealGeometryESSource.cmsGeometryDB_cff import *
8-
from Geometry.TrackerNumberingBuilder.trackerNumbering2026GeometryDB_cfi import *
8+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometryDB_cfi import *
99
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
1010
from Geometry.HcalCommonData.hcalSimulationParameters_cff import *
1111
from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *

‎Configuration/Geometry/python/GeometrySLHCSimIdeal_cff.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
# Ideal geometry, needed for simulation
44
from SLHCUpgradeSimulations.Geometry.Phase1_R30F12_cmsSimIdealGeometryXML_cff import *
5-
from Geometry.TrackerNumberingBuilder.trackerNumbering2026Geometry_cfi import *
5+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *

‎Configuration/Geometry/python/dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# this file exists to enforce dependencies for the generate2026Geometry unit test
1+
# this file exists to enforce dependencies for the generateRun4Geometry unit test
22
from Configuration.StandardSequences.GeometryConf import GeometryConf

‎Configuration/Geometry/python/dictRun4Geometry.py

Lines changed: 87 additions & 87 deletions
Large diffs are not rendered by default.

‎Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml renamed to ‎Geometry/CMSCommonData/data/beampipe/2030/v1/beampipe.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/beampipe/2026/v2/beampipe.xml renamed to ‎Geometry/CMSCommonData/data/beampipe/2030/v2/beampipe.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml renamed to ‎Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml renamed to ‎Geometry/CMSCommonData/data/caloBase/2030/v1/caloBase.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml renamed to ‎Geometry/CMSCommonData/data/caloBase/2030/v2/caloBase.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml renamed to ‎Geometry/CMSCommonData/data/caloBase/2030/v3/caloBase.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/caloBase/2026/v4/caloBase.xml renamed to ‎Geometry/CMSCommonData/data/caloBase/2030/v4/caloBase.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/caloBase/2026/v5/caloBase.xml renamed to ‎Geometry/CMSCommonData/data/caloBase/2030/v5/caloBase.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml renamed to ‎Geometry/CMSCommonData/data/caloBase/2030/v6/caloBase.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml renamed to ‎Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/caloBase/2026/v8/caloBase.xml renamed to ‎Geometry/CMSCommonData/data/caloBase/2030/v8/caloBase.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/cms/2026/v1/cms.xml renamed to ‎Geometry/CMSCommonData/data/cms/2015/v1/cms.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/cms/2030/v1/cms.xml

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
<?xml version="1.0"?>
2+
<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
3+
4+
<ConstantsSection label="cms.xml" eval="true">
5+
<Constant name="Rmin" value="[cmsextent:Rmin]"/>
6+
<Constant name="Zmin" value="[cmsextent:Zmin]"/>
7+
<Constant name="HallZ" value="[cmsextent:HallZ]"/>
8+
<Constant name="HallR" value="[cmsextent:HallR]"/>
9+
<Constant name="HallRMax" value="[cmsextent:HallRMax]"/>
10+
<Constant name="CMSR1" value="[cmsextent:CMSR1]"/>
11+
<Constant name="CMSR2" value="[cmsextent:CMSR2]"/>
12+
<Constant name="CMSR3" value="[cavernData:CMSR3]"/>
13+
<Constant name="CMSR4" value="[cavernData:CMSR4]"/>
14+
<Constant name="CMSZ1" value="[cmsextent:CMSZ1]"/>
15+
<Constant name="CMSZ2" value="[cmsextent:CMSZ2]"/>
16+
<Constant name="HFRiseZ1" value="[cavernData:HFRiseZ1]"/>
17+
<Constant name="HFRiseZ2" value="[cavernData:HFRiseZ2]"/>
18+
<Constant name="ShaftY" value="[cavernData:ShaftY]"/>
19+
<Constant name="ShaftZ" value="[cavernData:ShaftZ]"/>
20+
<Constant name="CMSZ2" value="[cmsextent:CMSZ2]"/>
21+
<Constant name="TrackCalorR" value="1.233*m"/>
22+
<Constant name="CalorMuonR" value="2.950*m"/>
23+
<Constant name="CalorMuonR2" value="2.810*m"/>
24+
<Constant name="TrackBeamZ1" value="1.948*m"/>
25+
<Constant name="TrackBeamZ2" value="2.935*m"/>
26+
<Constant name="TrackBeamSupZ1" value="1.630*m-.6*cm"/>
27+
<Constant name="TrackBeamSupZ2" value="1.630*m+.6*cm"/>
28+
<Constant name="TrackBeamR1" value="2.50*cm"/> <!-- 3.10*cm -->
29+
<Constant name="TrackBeamR2" value="7.40*cm"/>
30+
<Constant name="TrackLumiZ1" value="1.722*m"/>
31+
<Constant name="TrackLumiZ2" value="1.800*m"/>
32+
<Constant name="TrackLumiR1" value="7.70*cm"/>
33+
<Constant name="TrackLumiR1Min" value="3.170*cm"/>
34+
<Constant name="TrackLumiR2Min" value="3.3*cm"/>
35+
<Constant name="CalorBeamZ1" value="3.180*m"/>
36+
<Constant name="CalorBeamZ2" value="5.541*m"/>
37+
<Constant name="CalorBeamZ3" value="5.245*m"/>
38+
<Constant name="CalorBeamR1" value="8.00*cm"/>
39+
<Constant name="CalorBeamR2" value="8.93*cm"/>
40+
<Constant name="MuonBeamZ0" value="6.50*m"/>
41+
<Constant name="MuonBeamZ1" value="7.499*m"/>
42+
<Constant name="MuonBeamZ2" value="10.86*m"/>
43+
<Constant name="MuonBeamR0" value="10.50*cm"/>
44+
<Constant name="MuonBeamR1" value="11.785*cm"/>
45+
<Constant name="MuonBeamR2" value="76.80*cm"/>
46+
<Constant name="TotemMuonZ1" value="10.165*m"/>
47+
<Constant name="TotemMuonZ2" value="10.50*m"/>
48+
<Constant name="TotemMuonR1" value="1.0411*m"/>
49+
<Constant name="TotemMuonR2" value="1.1300*m"/>
50+
<Constant name="TotemBeamZ1" value="7.9500*m"/>
51+
<Constant name="TotemBeamZ2" value="13.381*m"/>
52+
<Constant name="TotemBeamZ3" value="13.439*m"/>
53+
<Constant name="TotemBeamZ4" value="13.465*m"/>
54+
<Constant name="TotemBeamR1" value="[MuonBeamR1]"/>
55+
<Constant name="TotemBeamR2" value="12.15*cm"/>
56+
<Constant name="TotemBeamR3" value="12.20*cm"/>
57+
<Constant name="TotemBeamR4" value="3.675*cm"/>
58+
<Constant name="TotemBeamR5" value="3.575*cm"/>
59+
<Constant name="ForwdBeamZ1" value="10.539*m"/>
60+
<Constant name="ForwdBeamZ2" value="13.109*m"/>
61+
<Constant name="ForwdBeamZ3" value="13.290*m"/>
62+
<Constant name="ForwdBeamZ4" value="16.0305*m"/>
63+
<Constant name="ForwdBeamZ5" value="16.424*m"/>
64+
<Constant name="ForwdBeamZ6" value="17.058*m"/>
65+
<Constant name="ForwdBeamZ7" value="17.920*m"/>
66+
<Constant name="ForwdBeamZ8" value="18.562*m"/>
67+
<Constant name="ForwdBeamZ9" value="18.905*m"/>
68+
<Constant name="ForwdBeamR0" value="15.95*cm"/>
69+
<Constant name="ForwdBeamR1" value="12.495*cm"/>
70+
<Constant name="ForwdBeamR2" value="12.50*cm"/>
71+
<Constant name="ForwdBeamR3" value="25.0*cm"/>
72+
<Constant name="ForwdBeamR4" value="2.85*cm+0.65*cm"/> <!-- Post LS2 beam-pipe -->
73+
<Constant name="ForwdBeamR5" value="7.50*cm"/>
74+
<Constant name="ForwdBeamR6" value="20.5*cm"/>
75+
<Constant name="ForwdBeamR7" value="4.00*cm"/>
76+
<Constant name="ForwdBeamR8" value="2.15*cm"/>
77+
<Constant name="ForwdVcalZ1" value="11.1495*m"/>
78+
<Constant name="ForwdVcalZ2" value="12.8005*m"/>
79+
<Constant name="ForwdVcalR1" value="1.595*m"/>
80+
<Constant name="ForwdDetsZ1" value="16.0065*m"/>
81+
<Constant name="ForwdDetsZ2" value="16.0065*m-1.6165*m"/>
82+
<Constant name="ForwdDetsR1" value="33.00*cm"/>
83+
<Constant name="MBarRmin" value="3.80*m"/>
84+
<Constant name="MBarRmax" value="[cms:CMSR4]"/>
85+
<Constant name="MBarZ" value="6.61*m"/>
86+
<Constant name="MBRingZ" value="1.268*m"/>
87+
<Constant name="MBRing1Zpos" value="2.686*m"/>
88+
<Constant name="MBRing2Zpos" value="5.342*m"/>
89+
<Constant name="MEndcapZ0" value="6.59*m"/>
90+
<Constant name="MEndcapZ1" value="6.835*m"/>
91+
<Constant name="MERmin0" value="66.569*cm"/>
92+
<Constant name="MERmin1" value="67.50*cm"/>
93+
<Constant name="MERmin2" value="70.00*cm"/>
94+
<Constant name="MERmin3" value="108.60*cm"/>
95+
</ConstantsSection>
96+
97+
<SolidSection label="cms.xml">
98+
<Polycone name="OCMS" startPhi="0*deg" deltaPhi="360*deg" >
99+
<ZSection z="-[CMSZ1]" rMin="[Rmin]" rMax="[CMSR2]" />
100+
<ZSection z="-[HallZ]" rMin="[Rmin]" rMax="[CMSR2]" />
101+
<ZSection z="-[HallZ]" rMin="[Rmin]" rMax="[ShaftY]+1*m"/>
102+
<ZSection z="-[ShaftZ]" rMin="[Rmin]" rMax="[ShaftY]+1*m"/>
103+
<ZSection z="-[ShaftZ]" rMin="[Rmin]" rMax="[HallRMax]+360*cm"/>
104+
<ZSection z="[HallZ]" rMin="[Rmin]" rMax="[HallRMax]+360*cm"/>
105+
<ZSection z="[HallZ]" rMin="[Rmin]" rMax="[CMSR2]" />
106+
<ZSection z="[CMSZ1]" rMin="[Rmin]" rMax="[CMSR2]" />
107+
</Polycone>
108+
<Polycone name="CMSEp" startPhi="0*deg" deltaPhi="360*deg" >
109+
<ZSection z="-[CMSZ1]" rMin="[Rmin]" rMax="[CMSR2]"/>
110+
<ZSection z="-[CMSZ2]" rMin="[Rmin]" rMax="[CMSR2]"/>
111+
<ZSection z="-[CMSZ2]" rMin="[Rmin]" rMax="[CMSR4]"/>
112+
<ZSection z="-[HFRiseZ1]" rMin="[Rmin]" rMax="[CMSR4]"/>
113+
<ZSection z="-[HFRiseZ1]" rMin="[Rmin]" rMax="[CMSR3]"/>
114+
<ZSection z="-[HFRiseZ2]" rMin="[Rmin]" rMax="[CMSR3]"/>
115+
<ZSection z="-[HFRiseZ2]" rMin="[Rmin]" rMax="[CMSR4]"/>
116+
<ZSection z="[HFRiseZ2]" rMin="[Rmin]" rMax="[CMSR4]"/>
117+
<ZSection z="[HFRiseZ2]" rMin="[Rmin]" rMax="[CMSR3]"/>
118+
<ZSection z="[HFRiseZ1]" rMin="[Rmin]" rMax="[CMSR3]"/>
119+
<ZSection z="[HFRiseZ1]" rMin="[Rmin]" rMax="[CMSR4]"/>
120+
<ZSection z="[CMSZ2]" rMin="[Rmin]" rMax="[CMSR4]"/>
121+
<ZSection z="[CMSZ2]" rMin="[Rmin]" rMax="[CMSR2]"/>
122+
<ZSection z="[CMSZ1]" rMin="[Rmin]" rMax="[CMSR2]"/>
123+
</Polycone>
124+
<Box name="YBFeetBox" dx="505*cm" dy="280*cm" dz="670*cm"/>
125+
<UnionSolid name="CMSE">
126+
<rSolid name="CMSEp"/>
127+
<rSolid name="YBFeetBox"/>
128+
<Translation x="0*fm" y="-880*cm+280*cm" z="0*fm"/>
129+
</UnionSolid>
130+
</SolidSection>
131+
<LogicalPartSection label="cms.xml">
132+
<LogicalPart name="World" category="unspecified">
133+
<rSolid name="OCMS"/>
134+
<rMaterial name="materials:Air"/>
135+
</LogicalPart>
136+
<LogicalPart name="OCMS" category="unspecified">
137+
<rSolid name="OCMS"/>
138+
<rMaterial name="materials:Air"/>
139+
</LogicalPart>
140+
<LogicalPart name="MCMS" category="unspecified">
141+
<rSolid name="OCMS"/>
142+
<rMaterial name="materials:Air"/>
143+
</LogicalPart>
144+
<LogicalPart name="CMSE" category="unspecified">
145+
<rSolid name="CMSE"/>
146+
<rMaterial name="materials:Air"/>
147+
</LogicalPart>
148+
</LogicalPartSection>
149+
150+
</DDDefinition>

‎Geometry/CMSCommonData/data/cms/2026/v2/cms.xml renamed to ‎Geometry/CMSCommonData/data/cms/2030/v2/cms.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/cms/2026/v3/cms.xml renamed to ‎Geometry/CMSCommonData/data/cms/2030/v3/cms.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/cms/2026/v4/cms.xml renamed to ‎Geometry/CMSCommonData/data/cms/2030/v4/cms.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/cms/2026/v5/cms.xml renamed to ‎Geometry/CMSCommonData/data/cms/2030/v5/cms.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml renamed to ‎Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml

File renamed without changes.

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D100.xml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
<Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
99
<Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
1010
<Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
11-
<Include ref='Geometry/CMSCommonData/data/cms/2026/v5/cms.xml'/>
11+
<Include ref='Geometry/CMSCommonData/data/cms/2030/v5/cms.xml'/>
1212
<Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
1313
<Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
1414
<Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
15-
<Include ref='Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml'/>
15+
<Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
1616
<Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
17-
<Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
17+
<Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
1818
<Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
1919
<Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
20-
<Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
21-
<Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
20+
<Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
21+
<Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
2222
<Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
2323
<Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
2424
<Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
@@ -42,9 +42,9 @@
4242
<Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
4343
<Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT702_2021_03/pixelProdCuts.xml'/>
4444
<Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
45-
<Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
46-
<Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
47-
<Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
45+
<Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
46+
<Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
47+
<Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
4848
<Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
4949
<Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
5050
<Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
@@ -72,22 +72,22 @@
7272
<Include ref='Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml'/>
7373
<Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
7474
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
75-
<Include ref='Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml'/>
76-
<Include ref='Geometry/MuonCommonData/data/mf/2026/v8/mf.xml'/>
75+
<Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml'/>
76+
<Include ref='Geometry/MuonCommonData/data/mf/2030/v8/mf.xml'/>
7777
<Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
78-
<Include ref='Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml'/>
78+
<Include ref='Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml'/>
7979
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
8080
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
81-
<Include ref='Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml'/>
82-
<Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml'/>
81+
<Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
82+
<Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
8383
<Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
84-
<Include ref='Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml'/>
85-
<Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
84+
<Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
85+
<Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
8686
<Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
8787
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
8888
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
8989
<Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
90-
<Include ref='Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml'/>
90+
<Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
9191
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
9292
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
9393
<Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
@@ -101,21 +101,21 @@
101101
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
102102
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
103103
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
104-
<Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
104+
<Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
105105
<Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
106106
<Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
107107
<Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml'/>
108108
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
109109
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
110-
<Include ref='Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml'/>
110+
<Include ref='Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
111111
<Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
112112
<Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
113113
<Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
114114
<Include ref='Geometry/MTDSimData/data/v4/mtdsens.xml'/>
115-
<Include ref='Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml'/>
115+
<Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
116116
<Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
117117
<Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
118-
<Include ref='Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml'/>
118+
<Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
119119
<Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
120120
<Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
121121
<Include ref='Geometry/MTDSimData/data/v4/mtdProdCuts.xml'/>

0 commit comments

Comments
 (0)