Merge pull request #42477 from bsunanda/Phase2-gex168

Phase2-gex168 Modify all Phase2 scenarios after fixing the HCAL SD issue
cms-sw · Aug 6, 2023 · 4a44c58 · 4a44c58
2 parents 32826b2 + 22382c5
commit 4a44c58
Show file tree

Hide file tree

Showing 27 changed files with 93 additions and 93 deletions.
diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
@@ -299,8 +299,8 @@
             'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
             'Geometry/HcalCommonData/data/hcalouteralgo.xml',
             'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-            'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
-            'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml',
+            'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml',
+            'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml',
             'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
             'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
             'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml',
@@ -315,7 +315,7 @@
         3 : [
             'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
             'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
-            'Geometry/HcalSimData/data/hf.xml',
+            'Geometry/HcalSimData/data/hf/v1/hf.xml',
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',
             'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
@@ -374,8 +374,8 @@
             'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
             'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
             'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-            'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
-            'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
+            'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml',
+            'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml',
             'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
             'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml',
             'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml',
@@ -389,7 +389,7 @@
         3 : [
             'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
             'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
-            'Geometry/HcalSimData/data/hf.xml',
+            'Geometry/HcalSimData/data/hf/v1/hf.xml',
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',
             'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
@@ -448,8 +448,8 @@
             'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
             'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
             'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-            'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
-            'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
+            'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml',
+            'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml',
             'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
             'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml',
             'Geometry/HGCalCommonData/data/hgcalwafer/v17n/hgcalwafer.xml',
@@ -462,7 +462,7 @@
         3 : [
             'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
             'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
-            'Geometry/HcalSimData/data/hf.xml',
+            'Geometry/HcalSimData/data/hf/v1/hf.xml',
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',
             'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
@@ -521,8 +521,8 @@
             'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
             'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
             'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-            'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
-            'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
+            'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml',
+            'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml',
             'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
             'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml',
             'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml',
@@ -541,7 +541,7 @@
         3 : [
             'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
             'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
-            'Geometry/HcalSimData/data/hf.xml',
+            'Geometry/HcalSimData/data/hf/v1/hf.xml',
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',
             'Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml',
@@ -607,8 +607,8 @@
             'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
             'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
             'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-            'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
-            'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
+            'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml',
+            'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml',
             'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
             'Geometry/HGCalCommonData/data/hgcal/v17ng/hgcal.xml',
             'Geometry/HGCalCommonData/data/hgcalwafer/v17ng/hgcalwafer.xml',
@@ -621,7 +621,7 @@
         3 : [
             'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
             'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
-            'Geometry/HcalSimData/data/hf.xml',
+            'Geometry/HcalSimData/data/hf/v1/hf.xml',
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',
             'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D100.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D100.xml
@@ -53,8 +53,8 @@
     <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
     <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml'/>
@@ -97,7 +97,7 @@
     <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
     <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hf/v1/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
     <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D101.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D101.xml
@@ -55,8 +55,8 @@
     <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcal/v17ng/hgcal.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v17ng/hgcalwafer.xml'/>
@@ -97,7 +97,7 @@
     <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
     <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hf/v1/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
     <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml
@@ -54,8 +54,8 @@
     <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
     <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml'/>
@@ -98,7 +98,7 @@
     <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
     <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hf/v1/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
     <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml
@@ -54,8 +54,8 @@
     <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
     <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml'/>
@@ -98,7 +98,7 @@
     <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
     <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hf/v1/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
     <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml
@@ -53,8 +53,8 @@
     <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
     <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml'/>
@@ -97,7 +97,7 @@
     <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
     <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hf/v1/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
     <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml
@@ -55,8 +55,8 @@
     <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml'/>
@@ -98,7 +98,7 @@
     <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
     <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hf/v1/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
     <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D93.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D93.xml
@@ -55,8 +55,8 @@
     <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v17n/hgcalwafer.xml'/>
@@ -97,7 +97,7 @@
     <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
     <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hf/v1/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
     <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D94.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D94.xml
@@ -55,8 +55,8 @@
     <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml'/>
@@ -103,7 +103,7 @@
     <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
     <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hf/v1/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
     <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D95.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D95.xml
@@ -54,8 +54,8 @@
     <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v1/hcalRecNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v2/hcalSimNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
     <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml'/>
@@ -98,7 +98,7 @@
     <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
     <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hf/v1/hf.xml'/>
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
     <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>