Rearrange the files to enable both DDD and DD4Hep to work

cms-sw · Apr 15, 2020 · b153341 · b153341
1 parent e7bceb9
commit b153341
Show file tree

Hide file tree

Showing 16 changed files with 196 additions and 47 deletions.
diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
@@ -75,7 +75,7 @@
             'Geometry/CMSCommonData/data/muonMagnet.xml',
             'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
             'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
-            'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',           
+            'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
             'Geometry/CMSCommonData/data/cms/2026/v3/cms.xml',
             'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
             'Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml',
@@ -396,11 +396,11 @@
             'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
             'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
             'Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml',
+            'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+            'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
             'Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml',
             'Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml',
             'Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml',
-            'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-            'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
             'Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml',
         ],
         3 : [
@@ -470,15 +470,16 @@
             'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
             'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
             'Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml',
+            'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+            'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
             'Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml',
             'Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml',
             'Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml',
-            'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-            'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
             'Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml',
-            'Geometry/ForwardCommonData/data/hfnose/v1/hfnose.xml',
-            'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml',
+            'Geometry/ForwardCommonData/data/hfnose/v1a/hfnose.xml',
             'Geometry/ForwardCommonData/data/hfnoseCell/v1/hfnoseCell.xml',
+            'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml',
+            'Geometry/ForwardCommonData/data/hfnoseLayer/v1/hfnoseLayer.xml',
             'Geometry/ForwardCommonData/data/hfnoseCons/v1/hfnoseCons.xml',
         ],
         3 : [
@@ -554,11 +555,11 @@
             'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
             'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
             'Geometry/HGCalCommonData/data/hgcal/v10/hgcal.xml',
+            'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+            'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
             'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
             'Geometry/HGCalCommonData/data/hgcalHEsil/v10/hgcalHEsil.xml',
             'Geometry/HGCalCommonData/data/hgcalHEmix/v10/hgcalHEmix.xml',
-            'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-            'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
             'Geometry/HGCalCommonData/data/hgcalCons/v10/hgcalCons.xml',
         ],
         3 : [
@@ -627,11 +628,11 @@
             'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
             'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
             'Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml',
+            'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+            'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
             'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
             'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml',
             'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml',
-            'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-            'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
             'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml',
         ],
         3 : [
@@ -700,15 +701,16 @@
             'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
             'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
             'Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml',
+            'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+            'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
             'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
             'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml',
             'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml',
-            'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-            'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
             'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml',
-            'Geometry/ForwardCommonData/data/hfnose/v2/hfnose.xml',
-            'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml',
+            'Geometry/ForwardCommonData/data/hfnose/v3/hfnose.xml',
             'Geometry/ForwardCommonData/data/hfnoseCell/v1/hfnoseCell.xml',
+            'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml',
+            'Geometry/ForwardCommonData/data/hfnoseLayer/v1/hfnoseLayer.xml',
             'Geometry/ForwardCommonData/data/hfnoseCons/v1/hfnoseCons.xml',
         ],
         3 : [

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D35XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D35XML_cfi.py
@@ -60,11 +60,11 @@
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
         'Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml',
         'Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml',
         'Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml',
         'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D41XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D41XML_cfi.py
@@ -59,11 +59,11 @@
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v10/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
         'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
         'Geometry/HGCalCommonData/data/hgcalHEsil/v10/hgcalHEsil.xml',
         'Geometry/HGCalCommonData/data/hgcalHEmix/v10/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v10/hgcalCons.xml',
         'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D43XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D43XML_cfi.py
@@ -60,11 +60,11 @@
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
         'Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml',
         'Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml',
         'Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml',
         'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D44XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D44XML_cfi.py
@@ -60,15 +60,16 @@
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
         'Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml',
         'Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml',
         'Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml',
-        'Geometry/ForwardCommonData/data/hfnose/v1/hfnose.xml',
-        'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml',
+        'Geometry/ForwardCommonData/data/hfnose/v1a/hfnose.xml',
         'Geometry/ForwardCommonData/data/hfnoseCell/v1/hfnoseCell.xml',
+        'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml',
+        'Geometry/ForwardCommonData/data/hfnoseLayer/v1/hfnoseLayer.xml',
         'Geometry/ForwardCommonData/data/hfnoseCons/v1/hfnoseCons.xml',
         'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D45XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D45XML_cfi.py
@@ -59,11 +59,11 @@
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v10/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
         'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
         'Geometry/HGCalCommonData/data/hgcalHEsil/v10/hgcalHEsil.xml',
         'Geometry/HGCalCommonData/data/hgcalHEmix/v10/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v10/hgcalCons.xml',
         'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D46XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D46XML_cfi.py
@@ -59,11 +59,11 @@
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
         'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
         'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml',
         'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml',
         'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D47XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D47XML_cfi.py
@@ -59,15 +59,16 @@
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
         'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
         'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml',
         'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml',
-        'Geometry/ForwardCommonData/data/hfnose/v2/hfnose.xml',
-        'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml',
+        'Geometry/ForwardCommonData/data/hfnose/v3/hfnose.xml',
         'Geometry/ForwardCommonData/data/hfnoseCell/v1/hfnoseCell.xml',
+        'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml',
+        'Geometry/ForwardCommonData/data/hfnoseLayer/v1/hfnoseLayer.xml',
         'Geometry/ForwardCommonData/data/hfnoseCons/v1/hfnoseCons.xml',
         'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D48XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D48XML_cfi.py
@@ -59,11 +59,11 @@
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
         'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
         'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml',
         'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml',
         'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D49XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D49XML_cfi.py
@@ -59,11 +59,11 @@
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
         'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
         'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml',
         'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml',
         'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D50XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D50XML_cfi.py
@@ -59,11 +59,11 @@
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
         'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
         'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml',
         'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml',
         'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D51XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D51XML_cfi.py
@@ -59,11 +59,11 @@
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
         'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
         'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml',
         'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml',
         'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D52XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D52XML_cfi.py
@@ -59,11 +59,11 @@
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
         'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
         'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml',
         'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml',
         'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D53XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D53XML_cfi.py
@@ -59,11 +59,11 @@
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
         'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
         'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml',
         'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml',
         'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D54XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D54XML_cfi.py
@@ -59,11 +59,11 @@
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
         'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
         'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml',
         'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml',
         'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',