From 74ae9ff90eaced1d8121515569e5d2ac271dd9f9 Mon Sep 17 00:00:00 2001
From: Sunanda <sunanda.banerjee@cern.ch>
Date: Fri, 15 Nov 2024 07:37:06 +0100
Subject: [PATCH] First version of 2025 scenario - still needed the correct PPS
 geometry with the needed rotation

---
 Configuration/Geometry/README.md              |   3 +-
 .../GeometryDD4hepExtended2025Reco_cff.py     |  51 +++
 .../python/GeometryDD4hepExtended2025_cff.py  |  15 +
 .../python/GeometryExtended2025Reco_cff.py    |  51 +++
 .../python/GeometryExtended2025_cff.py        |  13 +
 .../Geometry/python/dict2021Geometry.py       |  15 +-
 .../StandardSequences/python/GeometryConf.py  |   2 +
 .../data/dd4hep/cmsExtendedGeometry2025.xml   | 382 +++++++++++++++++
 .../python/cmsExtendedGeometry2025XML_cfi.py  | 386 ++++++++++++++++++
 9 files changed, 910 insertions(+), 8 deletions(-)
 create mode 100644 Configuration/Geometry/python/GeometryDD4hepExtended2025Reco_cff.py
 create mode 100644 Configuration/Geometry/python/GeometryDD4hepExtended2025_cff.py
 create mode 100644 Configuration/Geometry/python/GeometryExtended2025Reco_cff.py
 create mode 100644 Configuration/Geometry/python/GeometryExtended2025_cff.py
 create mode 100644 Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2025.xml
 create mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometry2025XML_cfi.py

diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
index 1e8c40f1a6112..a0b3cab945a94 100644
--- a/Configuration/Geometry/README.md
+++ b/Configuration/Geometry/README.md
@@ -33,7 +33,8 @@ Calorimeters:
 Muon system:
 * M1: 2021 baseline with additional chambers in GE21 and iRPC31/41
 * M2: 2023 GE21 shifted in position
-* M3: 2024 with additional chambers in GE21 and iRPC31
+* M4: 2024 with additional chambers in GE21 and iRPC31
+* M5: 2025 with additional chambers in GE21 and iRPC
 
 PPS:
 * P7: 2021 baseline (after removing overlaps and using common materials whenever possible)
diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2025Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2025Reco_cff.py
new file mode 100644
index 0000000000000..17b67589ad895
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryDD4hepExtended2025Reco_cff.py
@@ -0,0 +1,51 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2021Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryDD4hepExtended2025_cff import *
+
+# tracker
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *
+from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+
+# calo
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
+CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
+    SelectedCalos = cms.vstring("HCAL",
+                                "ZDC",
+                                "EcalBarrel",
+                                "EcalEndcap",
+                                "EcalPreshower",
+                                "TOWER",
+    )
+)
+from Geometry.EcalAlgo.EcalGeometry_cfi import *
+from Geometry.HcalEventSetup.HcalGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
+from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+
+# muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+# forward
+from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
+
+# pps
+
+
diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2025_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2025_cff.py
new file mode 100644
index 0000000000000..89656ffe72ac9
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryDD4hepExtended2025_cff.py
@@ -0,0 +1,15 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2021Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryDD4hep_cff import *
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2025.xml")
+
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
+from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
+from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
+from Geometry.MuonNumbering.muonGeometryConstants_cff import *
+from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
+
diff --git a/Configuration/Geometry/python/GeometryExtended2025Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2025Reco_cff.py
new file mode 100644
index 0000000000000..c9347746fe067
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryExtended2025Reco_cff.py
@@ -0,0 +1,51 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2021Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryExtended2025_cff import *
+
+# tracker
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *
+from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+
+# calo
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
+CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
+    SelectedCalos = cms.vstring("HCAL",
+                                "ZDC",
+                                "EcalBarrel",
+                                "EcalEndcap",
+                                "EcalPreshower",
+                                "TOWER",
+    )
+)
+from Geometry.EcalAlgo.EcalGeometry_cfi import *
+from Geometry.HcalEventSetup.HcalGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
+from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+
+# muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+# forward
+from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
+
+# pps
+
+
diff --git a/Configuration/Geometry/python/GeometryExtended2025_cff.py b/Configuration/Geometry/python/GeometryExtended2025_cff.py
new file mode 100644
index 0000000000000..f87744a11bdf8
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryExtended2025_cff.py
@@ -0,0 +1,13 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2021Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Geometry.CMSCommonData.cmsExtendedGeometry2025XML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
+from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
+from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
+from Geometry.MuonNumbering.muonGeometryConstants_cff import *
+from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
+
diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
index d829d79dd405c..24eda0dcbaabd 100644
--- a/Configuration/Geometry/python/dict2021Geometry.py
+++ b/Configuration/Geometry/python/dict2021Geometry.py
@@ -1624,7 +1624,7 @@
         ],
         "era" : "run3_GEM",
     },
-    "M3" : {
+    "M4" : {
         1 : [
             'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
             'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
@@ -1637,7 +1637,7 @@
             'Geometry/MuonCommonData/data/rpcf/2024/v1/rpcf.xml',
             'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
             'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-            'Geometry/MuonCommonData/data/gem21/2024/v1/gem21.xml',
+            'Geometry/MuonCommonData/data/gem21/2024/v2/gem21.xml',
             'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
             'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
         ],
@@ -1669,7 +1669,7 @@
         ],
         "era" : "run3_GEM",
     },
-    "M4" : {
+    "M5" : {
         1 : [
             'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
             'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
@@ -1679,10 +1679,10 @@
             'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
             'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
             'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
-            'Geometry/MuonCommonData/data/rpcf/2024/v1/rpcf.xml',
+            'Geometry/MuonCommonData/data/rpcf/2025/v1/rpcf.xml',
             'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
             'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-            'Geometry/MuonCommonData/data/gem21/2024/v2/gem21.xml',
+            'Geometry/MuonCommonData/data/gem21/2025/v1/gem21.xml',
             'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
             'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
         ],
@@ -1946,7 +1946,8 @@
     ("O5","T6","C2","M4","F2","P7") : "2024FlatMinus10Percent",
     ("O5","T7","C2","M4","F2","P7") : "2024FlatPlus05Percent",
     ("O5","T8","C2","M4","F2","P7") : "2024FlatPlus10Percent",
+    ("O6","T3","C2","M5","F3","P7") : "2025",
  }
 
-deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "P1", "P2", "P3", 
-                          "P4", "P5", "P6" ])
+deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "M3", "P1", "P2",
+                           "P3", "P4", "P5", "P6" ])
diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py
index 651a516d97fb5..d287136fc2f1a 100644
--- a/Configuration/StandardSequences/python/GeometryConf.py
+++ b/Configuration/StandardSequences/python/GeometryConf.py
@@ -72,6 +72,8 @@
     'DD4hepExtended2024FlatPlus05Percent' : 'DD4hepExtended2024FlatPlus05Percent,DD4hepExtended2024FlatPls05PercentReco',
     'Extended2024FlatPlus10Percent' : 'Extended2024FlatPlus10Percent,Extended2024FlatPlus10PercentReco',
     'DD4hepExtended2024FlatPlus10Percent' : 'DD4hepExtended2024FlatPlus10Percent,DD4hepExtended2024FlatPlus10PercentReco',
+    'Extended2025'   : 'Extended2025,Extended2025Reco',
+    'DD4hepExtended2025'   : 'DD4hepExtended2025,DD4hepExtended2025Reco',
     'All'         : 'Configuration.Geometry.GeometrySimAll_cff,Reco',
     'ECALHCAL'    : 'Configuration.Geometry.GeometrySimECALHCAL_cff,Configuration.Geometry.GeometryRecoECALHCAL_cff',
     'TrackerOnly' : 'Configuration.Geometry.GeometrySimTracker_cff,Configuration.Geometry.GeometryRecoTracker_cff',
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2025.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2025.xml
new file mode 100644
index 0000000000000..2e4f8f69c5c96
--- /dev/null
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2025.xml
@@ -0,0 +1,382 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  <open_geometry/>
+  <close_geometry/>
+
+  <IncludeSection>
+    <Include ref='Geometry/CMSCommonData/data/materials/2021/v3/materials.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/extend/v3/cmsextent.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2021/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/2017/v1/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2018/v1/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2021/v1/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2021/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/cavernFloor/2017/v1/cavernFloor.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/pixfwdMaterials/2021/v3/pixfwdMaterials.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdCylinder.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdDisks.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v3/pixfwd.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdSupportRingParameters.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZplus.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZminus.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdOuterDiskZplus.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdOuterDiskZminus.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeInnerZplus.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeInnerZminus.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeOuterZplus.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeOuterZminus.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v3/pixbarmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladder.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull0.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull1.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull2.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull3.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer0.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer1.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer2.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer3.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbar.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/Run2/trackerpatchpannel.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/Run2/trackerpixelnose.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibtidcommonmaterial/2021/v2/tibtidcommonmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibmaterial/2021/v2/tibmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibmodpar.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibmodule0.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibmodule0a.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibmodule0b.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibmodule2.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstringpar.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring0ll.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring0lr.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring0ul.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring0ur.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring0.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring1ll.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring1lr.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring1ul.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring1ur.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring1.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring2ll.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring2lr.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring2ul.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring2ur.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring2.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring3ll.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring3lr.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring3ul.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring3ur.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibstring3.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tiblayerpar.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tiblayer0.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tiblayer1.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tiblayer2.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tiblayer3.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tib.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidmaterial/2021/v2/tidmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidmodpar.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidmodule0.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidmodule0r.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidmodule0l.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidmodule1.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidmodule1r.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidmodule1l.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidmodule2.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidringpar.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidring0.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidring0f.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidring0b.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidring1.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidring1f.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidring1b.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidring2.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tid.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidf.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidb.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibtidservices.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibtidservicesf.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibtidservicesb.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobmaterial/2021/v2/tobmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobmodpar.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobmodule0.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobmodule2.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobmodule4.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrodpar.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod0c.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod0l.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod0h.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod0.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod1l.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod1h.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod1.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod2c.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod2l.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod2h.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod2.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod3l.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod3h.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod3.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod4c.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod4l.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod4h.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod4.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod5l.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod5h.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobrod5.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tob/v3/tob.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecmaterial/2021/v1/tecmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecmodpar.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecmodule0.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecmodule0r.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecmodule0s.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecmodule1.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecmodule1r.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecmodule1s.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecmodule2.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecmodule3.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecmodule4.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecmodule4r.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecmodule4s.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecmodule5.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecmodule6.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecpetpar.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring0.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring1.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring2.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring3.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring4.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring5.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring6.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring0f.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring1f.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring2f.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring3f.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring4f.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring5f.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring6f.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring0b.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring1b.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring2b.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring3b.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring4b.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring5b.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecring6b.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecpetalf.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecpetalb.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecpetal0.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecpetal0f.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecpetal0b.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecpetal3.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecpetal3f.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecpetal3b.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecpetal6f.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecpetal6b.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecpetal8f.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecpetal8b.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecwheel/2021/v1/tecwheel.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecwheela.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecwheelb.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecwheelc.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecwheeld.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecwheel6.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecservices.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tecbackplate.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tec.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/Run2/tracker.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/trackerpixbar.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerpixfwd.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/trackertibtidservices.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/trackertib.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/trackertid.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/trackertob.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/trackertec.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/v2/trackerbulkhead.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/trackerother.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml'/>
+    <Include ref='Geometry/TrackerSimData/data/PhaseI/trackersens.xml'/>
+    <Include ref='Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml'/>
+    <Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml'/>
+    <Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
+    <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/escon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eefixed/2021/v1/eefixed.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eehier.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eealgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/esalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eeF.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eeB.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalrotations.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcal/PhaseI/hcalalgo.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalcablealgo.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalbarrelalgo.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalendcap/PhaseI/hcalendcapalgo.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/v2/hcalRecNumbering.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2025/v1/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2025/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/bhm.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/pltbcm/2021/v1/pltbcm.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/bcm1f/2021/v1/bcm1f.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/plt/2021/v1/plt.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/rpd/2021/v2/rpd.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_001.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_002.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_003.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_004.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_005.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_020.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_021.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_022.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_023.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_024.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_025.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_100.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_101.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_102.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_103.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_104.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_105.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_120.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_121.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_122.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_123.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Transformations.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_001.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_002.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_004.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_005.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_020.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_021.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_024.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_025.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_100.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_101.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_102.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_104.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_105.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_120.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_121.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Device/v1/RP_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Simu/v2/RP_Vertical_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/Simu/v2/RP_Horizontal_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_Stations_Assembly.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Cuts_Per_Region/Simu/v1/CTPPS_Cuts_Per_Region.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Timing_Station_Parameters.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot/v2/CTPPS_Timing_Horizontal_Pot.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern1_Segment1.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment1.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment2.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment1.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment2.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment3.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment4.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment1.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment2.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment3.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment4.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment5.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly/v1/CTPPS_Diamond_Detector_Assembly.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml'/>
+    <Include ref='Geometry/EcalSimData/data/ecalsens.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalsens/2021/v2/hcalsenspmf.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2021/v1/CaloUtil.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml'/>
+    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml'/>
+    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
+    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
+    <Include ref='Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml'/>
+    <Include ref='Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml'/>
+    <Include ref='Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/totemsensT2/2021/totemsensT2.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/bhmsens.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/pltsens.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/bcm1fsens.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/zdcsens/2021/v1/zdcsens.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2021/v2/HcalProdCuts.xml'/>
+    <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
+    <Include ref='Geometry/EcalSimData/data/ESProdCuts.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/bhmProdCuts/2021/v1/bhmProdCuts.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v3/zdcProdCuts.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
+  </IncludeSection>
+</DDDefinition>
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2025XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2025XML_cfi.py
new file mode 100644
index 0000000000000..cdb94072f1544
--- /dev/null
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2025XML_cfi.py
@@ -0,0 +1,386 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2021Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring(
+        'Geometry/CMSCommonData/data/materials/2021/v3/materials.xml',
+        'Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml',
+        'Geometry/CMSCommonData/data/rotations.xml',
+        'Geometry/CMSCommonData/data/extend/v3/cmsextent.xml',
+        'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
+        'Geometry/CMSCommonData/data/cms/2021/v3/cms.xml',
+        'Geometry/CMSCommonData/data/cmsMother.xml',
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
+        'Geometry/CMSCommonData/data/cmsTracker.xml',
+        'Geometry/CMSCommonData/data/caloBase/2017/v1/caloBase.xml',
+        'Geometry/CMSCommonData/data/cmsCalo.xml',
+        'Geometry/CMSCommonData/data/muonBase/2018/v1/muonBase.xml',
+        'Geometry/CMSCommonData/data/cmsMuon.xml',
+        'Geometry/CMSCommonData/data/mgnt.xml',
+        'Geometry/CMSCommonData/data/beampipe/2021/v1/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2021/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/muonMB.xml',
+        'Geometry/CMSCommonData/data/muonMagnet.xml',
+        'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
+        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml',
+        'Geometry/TrackerCommonData/data/pixfwdMaterials/2021/v3/pixfwdMaterials.xml',
+        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdCylinder.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdDisks.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v3/pixfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdSupportRingParameters.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZplus.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZminus.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdOuterDiskZplus.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdOuterDiskZminus.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeInnerZplus.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeInnerZminus.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeOuterZplus.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeOuterZminus.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v3/pixbarmaterial.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladder.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull0.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull1.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull2.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull3.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer0.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer1.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer2.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer3.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/v2/pixbar.xml',
+        'Geometry/TrackerCommonData/data/Run2/trackerpatchpannel.xml',
+        'Geometry/TrackerCommonData/data/Run2/trackerpixelnose.xml',
+        'Geometry/TrackerCommonData/data/tibtidcommonmaterial/2021/v2/tibtidcommonmaterial.xml',
+        'Geometry/TrackerCommonData/data/tibmaterial/2021/v2/tibmaterial.xml',
+        'Geometry/TrackerCommonData/data/tibmodpar.xml',
+        'Geometry/TrackerCommonData/data/tibmodule0.xml',
+        'Geometry/TrackerCommonData/data/tibmodule0a.xml',
+        'Geometry/TrackerCommonData/data/tibmodule0b.xml',
+        'Geometry/TrackerCommonData/data/tibmodule2.xml',
+        'Geometry/TrackerCommonData/data/tibstringpar.xml',
+        'Geometry/TrackerCommonData/data/tibstring0ll.xml',
+        'Geometry/TrackerCommonData/data/tibstring0lr.xml',
+        'Geometry/TrackerCommonData/data/tibstring0ul.xml',
+        'Geometry/TrackerCommonData/data/tibstring0ur.xml',
+        'Geometry/TrackerCommonData/data/tibstring0.xml',
+        'Geometry/TrackerCommonData/data/tibstring1ll.xml',
+        'Geometry/TrackerCommonData/data/tibstring1lr.xml',
+        'Geometry/TrackerCommonData/data/tibstring1ul.xml',
+        'Geometry/TrackerCommonData/data/tibstring1ur.xml',
+        'Geometry/TrackerCommonData/data/tibstring1.xml',
+        'Geometry/TrackerCommonData/data/tibstring2ll.xml',
+        'Geometry/TrackerCommonData/data/tibstring2lr.xml',
+        'Geometry/TrackerCommonData/data/tibstring2ul.xml',
+        'Geometry/TrackerCommonData/data/tibstring2ur.xml',
+        'Geometry/TrackerCommonData/data/tibstring2.xml',
+        'Geometry/TrackerCommonData/data/tibstring3ll.xml',
+        'Geometry/TrackerCommonData/data/tibstring3lr.xml',
+        'Geometry/TrackerCommonData/data/tibstring3ul.xml',
+        'Geometry/TrackerCommonData/data/tibstring3ur.xml',
+        'Geometry/TrackerCommonData/data/tibstring3.xml',
+        'Geometry/TrackerCommonData/data/tiblayerpar.xml',
+        'Geometry/TrackerCommonData/data/tiblayer0.xml',
+        'Geometry/TrackerCommonData/data/tiblayer1.xml',
+        'Geometry/TrackerCommonData/data/tiblayer2.xml',
+        'Geometry/TrackerCommonData/data/tiblayer3.xml',
+        'Geometry/TrackerCommonData/data/tib.xml',
+        'Geometry/TrackerCommonData/data/tidmaterial/2021/v2/tidmaterial.xml',
+        'Geometry/TrackerCommonData/data/tidmodpar.xml',
+        'Geometry/TrackerCommonData/data/tidmodule0.xml',
+        'Geometry/TrackerCommonData/data/tidmodule0r.xml',
+        'Geometry/TrackerCommonData/data/tidmodule0l.xml',
+        'Geometry/TrackerCommonData/data/tidmodule1.xml',
+        'Geometry/TrackerCommonData/data/tidmodule1r.xml',
+        'Geometry/TrackerCommonData/data/tidmodule1l.xml',
+        'Geometry/TrackerCommonData/data/tidmodule2.xml',
+        'Geometry/TrackerCommonData/data/tidringpar.xml',
+        'Geometry/TrackerCommonData/data/tidring0.xml',
+        'Geometry/TrackerCommonData/data/tidring0f.xml',
+        'Geometry/TrackerCommonData/data/tidring0b.xml',
+        'Geometry/TrackerCommonData/data/tidring1.xml',
+        'Geometry/TrackerCommonData/data/tidring1f.xml',
+        'Geometry/TrackerCommonData/data/tidring1b.xml',
+        'Geometry/TrackerCommonData/data/tidring2.xml',
+        'Geometry/TrackerCommonData/data/tid.xml',
+        'Geometry/TrackerCommonData/data/tidf.xml',
+        'Geometry/TrackerCommonData/data/tidb.xml',
+        'Geometry/TrackerCommonData/data/tibtidservices.xml',
+        'Geometry/TrackerCommonData/data/tibtidservicesf.xml',
+        'Geometry/TrackerCommonData/data/tibtidservicesb.xml',
+        'Geometry/TrackerCommonData/data/tobmaterial/2021/v2/tobmaterial.xml',
+        'Geometry/TrackerCommonData/data/tobmodpar.xml',
+        'Geometry/TrackerCommonData/data/tobmodule0.xml',
+        'Geometry/TrackerCommonData/data/tobmodule2.xml',
+        'Geometry/TrackerCommonData/data/tobmodule4.xml',
+        'Geometry/TrackerCommonData/data/tobrodpar.xml',
+        'Geometry/TrackerCommonData/data/tobrod0c.xml',
+        'Geometry/TrackerCommonData/data/tobrod0l.xml',
+        'Geometry/TrackerCommonData/data/tobrod0h.xml',
+        'Geometry/TrackerCommonData/data/tobrod0.xml',
+        'Geometry/TrackerCommonData/data/tobrod1l.xml',
+        'Geometry/TrackerCommonData/data/tobrod1h.xml',
+        'Geometry/TrackerCommonData/data/tobrod1.xml',
+        'Geometry/TrackerCommonData/data/tobrod2c.xml',
+        'Geometry/TrackerCommonData/data/tobrod2l.xml',
+        'Geometry/TrackerCommonData/data/tobrod2h.xml',
+        'Geometry/TrackerCommonData/data/tobrod2.xml',
+        'Geometry/TrackerCommonData/data/tobrod3l.xml',
+        'Geometry/TrackerCommonData/data/tobrod3h.xml',
+        'Geometry/TrackerCommonData/data/tobrod3.xml',
+        'Geometry/TrackerCommonData/data/tobrod4c.xml',
+        'Geometry/TrackerCommonData/data/tobrod4l.xml',
+        'Geometry/TrackerCommonData/data/tobrod4h.xml',
+        'Geometry/TrackerCommonData/data/tobrod4.xml',
+        'Geometry/TrackerCommonData/data/tobrod5l.xml',
+        'Geometry/TrackerCommonData/data/tobrod5h.xml',
+        'Geometry/TrackerCommonData/data/tobrod5.xml',
+        'Geometry/TrackerCommonData/data/tob/v3/tob.xml',
+        'Geometry/TrackerCommonData/data/tecmaterial/2021/v1/tecmaterial.xml',
+        'Geometry/TrackerCommonData/data/tecmodpar.xml',
+        'Geometry/TrackerCommonData/data/tecmodule0.xml',
+        'Geometry/TrackerCommonData/data/tecmodule0r.xml',
+        'Geometry/TrackerCommonData/data/tecmodule0s.xml',
+        'Geometry/TrackerCommonData/data/tecmodule1.xml',
+        'Geometry/TrackerCommonData/data/tecmodule1r.xml',
+        'Geometry/TrackerCommonData/data/tecmodule1s.xml',
+        'Geometry/TrackerCommonData/data/tecmodule2.xml',
+        'Geometry/TrackerCommonData/data/tecmodule3.xml',
+        'Geometry/TrackerCommonData/data/tecmodule4.xml',
+        'Geometry/TrackerCommonData/data/tecmodule4r.xml',
+        'Geometry/TrackerCommonData/data/tecmodule4s.xml',
+        'Geometry/TrackerCommonData/data/tecmodule5.xml',
+        'Geometry/TrackerCommonData/data/tecmodule6.xml',
+        'Geometry/TrackerCommonData/data/tecpetpar.xml',
+        'Geometry/TrackerCommonData/data/tecring0.xml',
+        'Geometry/TrackerCommonData/data/tecring1.xml',
+        'Geometry/TrackerCommonData/data/tecring2.xml',
+        'Geometry/TrackerCommonData/data/tecring3.xml',
+        'Geometry/TrackerCommonData/data/tecring4.xml',
+        'Geometry/TrackerCommonData/data/tecring5.xml',
+        'Geometry/TrackerCommonData/data/tecring6.xml',
+        'Geometry/TrackerCommonData/data/tecring0f.xml',
+        'Geometry/TrackerCommonData/data/tecring1f.xml',
+        'Geometry/TrackerCommonData/data/tecring2f.xml',
+        'Geometry/TrackerCommonData/data/tecring3f.xml',
+        'Geometry/TrackerCommonData/data/tecring4f.xml',
+        'Geometry/TrackerCommonData/data/tecring5f.xml',
+        'Geometry/TrackerCommonData/data/tecring6f.xml',
+        'Geometry/TrackerCommonData/data/tecring0b.xml',
+        'Geometry/TrackerCommonData/data/tecring1b.xml',
+        'Geometry/TrackerCommonData/data/tecring2b.xml',
+        'Geometry/TrackerCommonData/data/tecring3b.xml',
+        'Geometry/TrackerCommonData/data/tecring4b.xml',
+        'Geometry/TrackerCommonData/data/tecring5b.xml',
+        'Geometry/TrackerCommonData/data/tecring6b.xml',
+        'Geometry/TrackerCommonData/data/tecpetalf.xml',
+        'Geometry/TrackerCommonData/data/tecpetalb.xml',
+        'Geometry/TrackerCommonData/data/tecpetal0.xml',
+        'Geometry/TrackerCommonData/data/tecpetal0f.xml',
+        'Geometry/TrackerCommonData/data/tecpetal0b.xml',
+        'Geometry/TrackerCommonData/data/tecpetal3.xml',
+        'Geometry/TrackerCommonData/data/tecpetal3f.xml',
+        'Geometry/TrackerCommonData/data/tecpetal3b.xml',
+        'Geometry/TrackerCommonData/data/tecpetal6f.xml',
+        'Geometry/TrackerCommonData/data/tecpetal6b.xml',
+        'Geometry/TrackerCommonData/data/tecpetal8f.xml',
+        'Geometry/TrackerCommonData/data/tecpetal8b.xml',
+        'Geometry/TrackerCommonData/data/tecwheel/2021/v1/tecwheel.xml',
+        'Geometry/TrackerCommonData/data/tecwheela.xml',
+        'Geometry/TrackerCommonData/data/tecwheelb.xml',
+        'Geometry/TrackerCommonData/data/tecwheelc.xml',
+        'Geometry/TrackerCommonData/data/tecwheeld.xml',
+        'Geometry/TrackerCommonData/data/tecwheel6.xml',
+        'Geometry/TrackerCommonData/data/tecservices.xml',
+        'Geometry/TrackerCommonData/data/tecbackplate.xml',
+        'Geometry/TrackerCommonData/data/tec.xml',
+        'Geometry/TrackerCommonData/data/Run2/tracker.xml',
+        'Geometry/TrackerCommonData/data/trackerpixbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/trackerpixfwd.xml',
+        'Geometry/TrackerCommonData/data/trackertibtidservices.xml',
+        'Geometry/TrackerCommonData/data/trackertib.xml',
+        'Geometry/TrackerCommonData/data/trackertid.xml',
+        'Geometry/TrackerCommonData/data/trackertob.xml',
+        'Geometry/TrackerCommonData/data/trackertec.xml',
+        'Geometry/TrackerCommonData/data/v2/trackerbulkhead.xml',
+        'Geometry/TrackerCommonData/data/trackerother.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
+        'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
+        'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml',
+        'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
+        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
+        'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
+        'Geometry/EcalCommonData/data/eecon.xml',
+        'Geometry/EcalCommonData/data/escon.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ebalgo.xml',
+        'Geometry/EcalCommonData/data/ebrot.xml',
+        'Geometry/EcalCommonData/data/eefixed/2021/v1/eefixed.xml',
+        'Geometry/EcalCommonData/data/eehier.xml',
+        'Geometry/EcalCommonData/data/eealgo.xml',
+        'Geometry/EcalCommonData/data/esalgo.xml',
+        'Geometry/EcalCommonData/data/eeF.xml',
+        'Geometry/EcalCommonData/data/eeB.xml',
+        'Geometry/EcalCommonData/data/ectkcable.xml',
+        'Geometry/HcalCommonData/data/hcalrotations.xml',
+        'Geometry/HcalCommonData/data/hcal/PhaseI/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/hcalcablealgo.xml',
+        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/hcalendcap/PhaseI/hcalendcapalgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+        'Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v2/hcalRecNumbering.xml',
+        'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
+        'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
+        'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',
+        'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
+        'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
+        'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2025/v1/rpcf.xml',
+        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
+        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
+        'Geometry/MuonCommonData/data/gem21/2025/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
+        'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
+    )+
+    cms.vstring(
+        'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml',
+        'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml',
+        'Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml',
+        'Geometry/ForwardCommonData/data/bhm.xml',
+        'Geometry/ForwardCommonData/data/pltbcm/2021/v1/pltbcm.xml',
+        'Geometry/ForwardCommonData/data/bcm1f/2021/v1/bcm1f.xml',
+        'Geometry/ForwardCommonData/data/plt/2021/v1/plt.xml',
+        'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
+        'Geometry/ForwardCommonData/data/lumimaterials.xml',
+        'Geometry/ForwardCommonData/data/zdcrotations.xml',
+        'Geometry/ForwardCommonData/data/lumirotations.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml',
+        'Geometry/ForwardCommonData/data/rpd/2021/v2/rpd.xml',
+        'Geometry/ForwardCommonData/data/cmszdc.xml',
+        'Geometry/VeryForwardData/data/RP_Box.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_001.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_002.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_003.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_004.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_005.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_020.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_021.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_022.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_023.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_024.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_025.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_100.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_101.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_102.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_103.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_104.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_105.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_120.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_121.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_122.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_123.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml',
+        'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml',
+        'Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml',
+        'Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml',
+        'Geometry/VeryForwardData/data/RP_Transformations.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_001.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_002.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_004.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_005.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_020.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_021.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_024.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_025.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_100.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_101.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_102.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_104.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_105.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_120.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_121.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
+        'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
+        'Geometry/VeryForwardData/data/RP_Device/v1/RP_Device.xml',
+        'Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Simu/v2/RP_Vertical_Device.xml',
+        'Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/Simu/v2/RP_Horizontal_Device.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Right_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Left_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Right_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Left_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_Stations_Assembly.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2021/Cuts_Per_Region/Simu/v1/CTPPS_Cuts_Per_Region.xml',
+        'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Timing_Station_Parameters.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot/v2/CTPPS_Timing_Horizontal_Pot.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern1_Segment1.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment1.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment2.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment1.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment2.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment3.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment4.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment1.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment2.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment3.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment4.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment5.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly/v1/CTPPS_Diamond_Detector_Assembly.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml',
+        'Geometry/EcalSimData/data/ecalsens.xml',
+        'Geometry/HcalCommonData/data/hcalsens/2021/v2/hcalsenspmf.xml',
+        'Geometry/HcalSimData/data/hf.xml',
+        'Geometry/HcalSimData/data/hfpmt.xml',
+        'Geometry/HcalSimData/data/hffibrebundle.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2021/v1/CaloUtil.xml',
+        'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml',
+        'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml',
+        'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml',
+        'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml',
+        'Geometry/ForwardSimData/data/totemsensT2/2021/totemsensT2.xml',
+        'Geometry/ForwardCommonData/data/bhmsens.xml',
+        'Geometry/ForwardSimData/data/pltsens.xml',
+        'Geometry/ForwardSimData/data/bcm1fsens.xml',
+        'Geometry/ForwardSimData/data/zdcsens/2021/v1/zdcsens.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2021/v2/HcalProdCuts.xml',
+        'Geometry/EcalSimData/data/EcalProdCuts.xml',
+        'Geometry/EcalSimData/data/ESProdCuts.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
+        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
+        'Geometry/ForwardSimData/data/bhmProdCuts/2021/v1/bhmProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts/2021/v3/zdcProdCuts.xml',
+        'Geometry/CMSCommonData/data/FieldParameters.xml',
+    ),
+    rootNodeName = cms.string('cms:OCMS')
+)