Skip to content

Commit dc86e97

Browse files
cmsbuildcmsbuild
authored
Merge pull request #48094 from bsunanda/Phse2-hgx363AAF
Phase2-hgx363AAF Update the directory names of several scenarios defined in Geometry/HcalAlgo and Geometry/HcalcommonData
2 parents f6c83bc + 7bc1c4e commit dc86e97

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

‎Geometry/HcalAlgo/data/cms-test-Phase2GeometryFine-algorithm.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,30 @@
2525
<Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
2626
<Include ref="Geometry/CMSCommonData/data/extend/v2/cmsextent.xml"/>
2727
<Include ref="Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml"/>
28-
<Include ref="Geometry/CMSCommonData/data/cms/2026/v1/cms.xml"/>
28+
<Include ref="Geometry/CMSCommonData/data/cms/2030/v1/cms.xml"/>
2929
<Include ref="Geometry/CMSCommonData/data/eta3/etaMax.xml"/>
3030
<Include ref="Geometry/CMSCommonData/data/cmsMother.xml"/>
31-
<Include ref="Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml"/>
31+
<Include ref="Geometry/CMSCommonData/data/caloBase/2030/v1/caloBase.xml"/>
3232
<Include ref="Geometry/CMSCommonData/data/cmsCalo.xml"/>
33-
<Include ref="Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml"/>
33+
<Include ref="Geometry/CMSCommonData/data/muonBase/2030/v2/muonBase.xml"/>
3434
<Include ref="Geometry/CMSCommonData/data/cmsMuon.xml"/>
3535
<Include ref="Geometry/CMSCommonData/data/muonMB.xml"/>
3636
<Include ref="Geometry/EcalCommonData/data/ectkcable.xml"/>
37-
<Include ref="Geometry/EcalCommonData/data/eregalgo/2026/v1/eregalgo.xml"/>
37+
<Include ref="Geometry/EcalCommonData/data/eregalgo/2030/v1/eregalgo.xml"/>
3838
<Include ref="Geometry/EcalCommonData/data/ebalgo.xml"/>
3939
<Include ref="Geometry/EcalCommonData/data/ebcon.xml"/>
4040
<Include ref="Geometry/EcalCommonData/data/ebrot.xml"/>
4141
<Include ref="Geometry/EcalCommonData/data/eecon.xml"/>
42-
<Include ref="Geometry/EcalCommonData/data/escon/2026/v1/escon.xml"/>
43-
<Include ref="Geometry/EcalCommonData/data/esalgo/2026/v1/esalgo.xml"/>
42+
<Include ref="Geometry/EcalCommonData/data/escon/2030/v1/escon.xml"/>
43+
<Include ref="Geometry/EcalCommonData/data/esalgo/2030/v1/esalgo.xml"/>
4444
<Include ref="Geometry/HcalCommonData/data/hcalrotations.xml"/>
4545
<Include ref="Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml"/>
4646
<Include ref="Geometry/HcalCommonData/data/hcalbarrelalgo.xml"/>
4747
<Include ref="Geometry/HcalCommonData/data/hcalendcap/SSAbsorber/hcalendcapalgo.xml"/>
4848
<Include ref="Geometry/HcalCommonData/data/hcalouteralgo.xml"/>
4949
<Include ref="Geometry/HcalCommonData/data/hcalforwardalgo.xml"/>
50-
<Include ref="Geometry/HcalCommonData/data/hcalSimNumbering/2026/hcalSimNumbering.xml"/>
51-
<Include ref="Geometry/HcalCommonData/data/hcalRecNumbering/2026/hcalRecNumbering.xml"/>
50+
<Include ref="Geometry/HcalCommonData/data/hcalSimNumbering/2030/hcalSimNumbering.xml"/>
51+
<Include ref="Geometry/HcalCommonData/data/hcalRecNumbering/2030/hcalRecNumbering.xml"/>
5252
<Include ref="Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml"/>
5353
<Include ref="Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml"/>
5454
<Include ref="Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml"/>

‎Geometry/HcalAlgo/data/cms-test-ddhcalPhase2-algorithm.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
<Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
2525
<Include ref="Geometry/CMSCommonData/data/extend/v2/cmsextent.xml"/>
2626
<Include ref="Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml"/>
27-
<Include ref="Geometry/CMSCommonData/data/cms/2026/v1/cms.xml"/>
27+
<Include ref="Geometry/CMSCommonData/data/cms/2030/v1/cms.xml"/>
2828
<Include ref="Geometry/CMSCommonData/data/eta3/etaMax.xml"/>
2929
<Include ref="Geometry/CMSCommonData/data/cmsMother.xml"/>
30-
<Include ref="Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml"/>
30+
<Include ref="Geometry/CMSCommonData/data/caloBase/2030/v1/caloBase.xml"/>
3131
<Include ref="Geometry/CMSCommonData/data/cmsCalo.xml"/>
32-
<Include ref="Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml"/>
32+
<Include ref="Geometry/CMSCommonData/data/muonBase/2030/v2/muonBase.xml"/>
3333
<Include ref="Geometry/CMSCommonData/data/cmsMuon.xml"/>
3434
<Include ref="Geometry/CMSCommonData/data/muonMB.xml"/>
3535
<Include ref="Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml"/>

‎Geometry/HcalAlgo/data/cmsExtendedGeometry2021.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<Include ref="Geometry/CMSCommonData/data/muonBase/2018/v1/muonBase.xml"/>
1717
<Include ref="Geometry/CMSCommonData/data/cmsMuon.xml"/>
1818
<Include ref="Geometry/CMSCommonData/data/mgnt.xml"/>
19-
<Include ref="Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml"/>
20-
<Include ref="Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml"/>
19+
<Include ref="Geometry/CMSCommonData/data/beampipe/2030/v1/beampipe.xml"/>
20+
<Include ref="Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml"/>
2121
<Include ref="Geometry/CMSCommonData/data/muonMB.xml"/>
2222
<Include ref="Geometry/CMSCommonData/data/muonMagnet.xml"/>
2323
<Include ref="Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml"/>

‎Geometry/HcalCommonData/data/dd4hep/cmsExtendedGeometryRun4D99.xml‎

Lines changed: 19 additions & 19 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'/>
8181
<Include ref='Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml'/>
82-
<Include ref='Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.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)