Merge pull request #9 from ghugo83/test

O5
ghugo83 · Jul 31, 2020 · e073d13 · e073d13
2 parents 3d36a2c + 781fbe3
commit e073d13
Show file tree

Hide file tree

Showing 27 changed files with 112 additions and 112 deletions.
diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
@@ -9,22 +9,22 @@
             'Geometry/CMSCommonData/data/materials.xml',
             'Geometry/CMSCommonData/data/rotations.xml',
             'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
+            'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
+            'Geometry/CMSCommonData/data/cms/2026/v3/cms.xml',
             'Geometry/CMSCommonData/data/cmsMother.xml',
             'Geometry/CMSCommonData/data/eta3/etaMax.xml',
             'Geometry/CMSCommonData/data/cmsTracker.xml',
+            'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
             'Geometry/CMSCommonData/data/cmsCalo.xml',
+            'Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml',
             'Geometry/CMSCommonData/data/cmsMuon.xml',
             'Geometry/CMSCommonData/data/mgnt.xml',
             'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
             'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
             'Geometry/CMSCommonData/data/muonMB.xml',
             '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/cms/2026/v3/cms.xml',
-            'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
-            'Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml',
         ],
         5 : [
             'Geometry/CMSCommonData/data/FieldParameters.xml',
@@ -36,22 +36,22 @@
             'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml',
             'Geometry/CMSCommonData/data/rotations.xml',
             'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
+            'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
+            'Geometry/CMSCommonData/data/cms/2026/v4/cms.xml',
             'Geometry/CMSCommonData/data/cmsMother.xml',
             'Geometry/CMSCommonData/data/eta3/etaMax.xml',
             'Geometry/CMSCommonData/data/cmsTracker.xml',
+            'Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml',
             'Geometry/CMSCommonData/data/cmsCalo.xml',
+            'Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml',
             'Geometry/CMSCommonData/data/cmsMuon.xml',
             'Geometry/CMSCommonData/data/mgnt.xml',
             'Geometry/CMSCommonData/data/beampipe/2026/v2/beampipe.xml',
             'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
             'Geometry/CMSCommonData/data/muonMB.xml',
             '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/cms/2026/v4/cms.xml',
-            'Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml',
-            'Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml',
         ],
         5 : [
             'Geometry/CMSCommonData/data/FieldParameters.xml',

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D49.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D49.xml
@@ -7,22 +7,22 @@
     <Include ref='Geometry/CMSCommonData/data/materials.xml'/>
     <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
     <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2026/v3/cms.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
     <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
     <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v3/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D50.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D50.xml
@@ -7,22 +7,22 @@
     <Include ref='Geometry/CMSCommonData/data/materials.xml'/>
     <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
     <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2026/v3/cms.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
     <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
     <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v3/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D51.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D51.xml
@@ -7,22 +7,22 @@
     <Include ref='Geometry/CMSCommonData/data/materials.xml'/>
     <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
     <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2026/v3/cms.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
     <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
     <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v3/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D53.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D53.xml
@@ -7,22 +7,22 @@
     <Include ref='Geometry/CMSCommonData/data/materials.xml'/>
     <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
     <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2026/v3/cms.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
     <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
     <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v3/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D54.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D54.xml
@@ -7,22 +7,22 @@
     <Include ref='Geometry/CMSCommonData/data/materials.xml'/>
     <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
     <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2026/v3/cms.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
     <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
     <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v3/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D56.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D56.xml
@@ -7,22 +7,22 @@
     <Include ref='Geometry/CMSCommonData/data/materials.xml'/>
     <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
     <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2026/v3/cms.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
     <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
     <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v3/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixfwd.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D57.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D57.xml
@@ -7,22 +7,22 @@
     <Include ref='Geometry/CMSCommonData/data/materials/2021/v1/materials.xml'/>
     <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
     <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2026/v4/cms.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
     <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
     <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v2/beampipe.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v4/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D58.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D58.xml
@@ -7,22 +7,22 @@
     <Include ref='Geometry/CMSCommonData/data/materials/2021/v1/materials.xml'/>
     <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
     <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2026/v4/cms.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
     <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
     <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v2/beampipe.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v4/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v3/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v4/muonBase.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml'/>