Skip to content

Commit 2b524a1

Browse files
authored
Merge pull request cms-sw#42589 from bsunanda/Phase2-gex169
Phase2-gex169 Modify the phas2 scenarios to accommodate the right set of hits for the HF
2 parents 0b4b3cf + 662d193 commit 2b524a1

27 files changed

+108
-108
lines changed

Configuration/Geometry/python/dict2026Geometry.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,9 @@
297297
'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
298298
'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
299299
'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
300-
'Geometry/HcalCommonData/data/hcalouteralgo.xml',
300+
'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
301301
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
302-
'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml',
302+
'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
303303
'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml',
304304
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
305305
'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
@@ -314,8 +314,8 @@
314314
],
315315
3 : [
316316
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
317-
'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
318-
'Geometry/HcalSimData/data/hf/v1/hf.xml',
317+
'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml',
318+
'Geometry/HcalSimData/data/hf.xml',
319319
'Geometry/HcalSimData/data/hfpmt.xml',
320320
'Geometry/HcalSimData/data/hffibrebundle.xml',
321321
'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
@@ -374,7 +374,7 @@
374374
'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
375375
'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
376376
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
377-
'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml',
377+
'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
378378
'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml',
379379
'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
380380
'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml',
@@ -388,8 +388,8 @@
388388
],
389389
3 : [
390390
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
391-
'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
392-
'Geometry/HcalSimData/data/hf/v1/hf.xml',
391+
'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml',
392+
'Geometry/HcalSimData/data/hf.xml',
393393
'Geometry/HcalSimData/data/hfpmt.xml',
394394
'Geometry/HcalSimData/data/hffibrebundle.xml',
395395
'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
@@ -448,7 +448,7 @@
448448
'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
449449
'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
450450
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
451-
'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml',
451+
'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
452452
'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml',
453453
'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
454454
'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml',
@@ -461,8 +461,8 @@
461461
],
462462
3 : [
463463
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
464-
'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
465-
'Geometry/HcalSimData/data/hf/v1/hf.xml',
464+
'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml',
465+
'Geometry/HcalSimData/data/hf.xml',
466466
'Geometry/HcalSimData/data/hfpmt.xml',
467467
'Geometry/HcalSimData/data/hffibrebundle.xml',
468468
'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
@@ -521,7 +521,7 @@
521521
'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
522522
'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
523523
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
524-
'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml',
524+
'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
525525
'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml',
526526
'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
527527
'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml',
@@ -540,8 +540,8 @@
540540
],
541541
3 : [
542542
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
543-
'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
544-
'Geometry/HcalSimData/data/hf/v1/hf.xml',
543+
'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml',
544+
'Geometry/HcalSimData/data/hf.xml',
545545
'Geometry/HcalSimData/data/hfpmt.xml',
546546
'Geometry/HcalSimData/data/hffibrebundle.xml',
547547
'Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml',
@@ -607,7 +607,7 @@
607607
'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
608608
'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
609609
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
610-
'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml',
610+
'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
611611
'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml',
612612
'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
613613
'Geometry/HGCalCommonData/data/hgcal/v17ng/hgcal.xml',
@@ -620,8 +620,8 @@
620620
],
621621
3 : [
622622
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
623-
'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
624-
'Geometry/HcalSimData/data/hf/v1/hf.xml',
623+
'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml',
624+
'Geometry/HcalSimData/data/hf.xml',
625625
'Geometry/HcalSimData/data/hfpmt.xml',
626626
'Geometry/HcalSimData/data/hffibrebundle.xml',
627627
'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D100.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
<Include ref='Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml'/>
5252
<Include ref='Geometry/HcalCommonData/data/hcalbarrelalgo.xml'/>
5353
<Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
54-
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
54+
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml'/>
5555
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
56-
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml'/>
56+
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
5757
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
5858
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
5959
<Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
@@ -96,8 +96,8 @@
9696
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml'/>
9797
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
9898
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
99-
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
100-
<Include ref='Geometry/HcalSimData/data/hf/v1/hf.xml'/>
99+
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml'/>
100+
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
101101
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
102102
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
103103
<Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D101.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
5656
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml'/>
5757
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
58-
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml'/>
58+
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
5959
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
6060
<Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
6161
<Include ref='Geometry/HGCalCommonData/data/hgcal/v17ng/hgcal.xml'/>
@@ -96,8 +96,8 @@
9696
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml'/>
9797
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
9898
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
99-
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
100-
<Include ref='Geometry/HcalSimData/data/hf/v1/hf.xml'/>
99+
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml'/>
100+
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
101101
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
102102
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
103103
<Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
<Include ref='Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml'/>
5353
<Include ref='Geometry/HcalCommonData/data/hcalbarrelalgo.xml'/>
5454
<Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
55-
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
55+
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml'/>
5656
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
57-
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml'/>
57+
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
5858
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
5959
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
6060
<Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
@@ -97,8 +97,8 @@
9797
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml'/>
9898
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
9999
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
100-
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
101-
<Include ref='Geometry/HcalSimData/data/hf/v1/hf.xml'/>
100+
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml'/>
101+
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
102102
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
103103
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
104104
<Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
<Include ref='Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml'/>
5353
<Include ref='Geometry/HcalCommonData/data/hcalbarrelalgo.xml'/>
5454
<Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
55-
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
55+
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml'/>
5656
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
57-
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml'/>
57+
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
5858
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
5959
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
6060
<Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
@@ -97,8 +97,8 @@
9797
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml'/>
9898
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
9999
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
100-
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
101-
<Include ref='Geometry/HcalSimData/data/hf/v1/hf.xml'/>
100+
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml'/>
101+
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
102102
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
103103
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
104104
<Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
<Include ref='Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml'/>
5252
<Include ref='Geometry/HcalCommonData/data/hcalbarrelalgo.xml'/>
5353
<Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
54-
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
54+
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml'/>
5555
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
56-
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml'/>
56+
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
5757
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
5858
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
5959
<Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
@@ -96,8 +96,8 @@
9696
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml'/>
9797
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
9898
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
99-
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
100-
<Include ref='Geometry/HcalSimData/data/hf/v1/hf.xml'/>
99+
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml'/>
100+
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
101101
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
102102
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
103103
<Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
5656
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml'/>
5757
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
58-
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml'/>
58+
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
5959
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
6060
<Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
6161
<Include ref='Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml'/>
@@ -97,8 +97,8 @@
9797
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml'/>
9898
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
9999
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
100-
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
101-
<Include ref='Geometry/HcalSimData/data/hf/v1/hf.xml'/>
100+
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml'/>
101+
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
102102
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
103103
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
104104
<Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D93.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
5656
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml'/>
5757
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
58-
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml'/>
58+
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
5959
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
6060
<Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
6161
<Include ref='Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml'/>
@@ -96,8 +96,8 @@
9696
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml'/>
9797
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
9898
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
99-
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
100-
<Include ref='Geometry/HcalSimData/data/hf/v1/hf.xml'/>
99+
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml'/>
100+
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
101101
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
102102
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
103103
<Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D94.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
5656
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml'/>
5757
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
58-
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml'/>
58+
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
5959
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
6060
<Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
6161
<Include ref='Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml'/>
@@ -102,8 +102,8 @@
102102
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml'/>
103103
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
104104
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
105-
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
106-
<Include ref='Geometry/HcalSimData/data/hf/v1/hf.xml'/>
105+
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml'/>
106+
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
107107
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
108108
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
109109
<Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml'/>

0 commit comments

Comments
 (0)