From f8316d2097cdf89231af6d141658e2f0161b63f2 Mon Sep 17 00:00:00 2001
From: Sunanda <sunanda.banerjee@cern.ch>
Date: Fri, 23 Feb 2024 08:25:54 +0100
Subject: [PATCH 1/2] Modify the RPC numbering scheme to avoid wrong DetId
 assignment

---
 .../Geometry/python/dict2021Geometry.py       |   2 +-
 .../data/dd4hep/cmsExtendedGeometry2024.xml   |   2 +-
 ...ExtendedGeometry2024FlatMinus05Percent.xml |   2 +-
 ...ExtendedGeometry2024FlatMinus10Percent.xml |   2 +-
 ...sExtendedGeometry2024FlatPlus05Percent.xml |   2 +-
 ...sExtendedGeometry2024FlatPlus10Percent.xml |   2 +-
 .../cmsExtendedGeometry2024ZeroMaterial.xml   |   2 +-
 ...edGeometry2024FlatMinus05PercentXML_cfi.py |   2 +-
 ...edGeometry2024FlatMinus10PercentXML_cfi.py |   2 +-
 ...dedGeometry2024FlatPlus05PercentXML_cfi.py |   2 +-
 ...dedGeometry2024FlatPlus10PercentXML_cfi.py |   2 +-
 .../python/cmsExtendedGeometry2024XML_cfi.py  |   2 +-
 ...ExtendedGeometry2024ZeroMaterialXML_cfi.py |   2 +-
 .../muonNumbering/2021/v6/muonNumbering.xml   | 504 ++++++++++++++++++
 14 files changed, 517 insertions(+), 13 deletions(-)
 create mode 100644 Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml

diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
index eb4a7a30a0deb..ac710bf5008fb 100644
--- a/Configuration/Geometry/python/dict2021Geometry.py
+++ b/Configuration/Geometry/python/dict2021Geometry.py
@@ -1497,7 +1497,7 @@
             'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
         ],
         2 : [
-            'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml',
+            'Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml',
         ],
         3 : [
             'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml',
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml
index f872d7db9a7c5..8f0d7aec07cb6 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml
@@ -249,7 +249,7 @@
     <Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2021/v5/muonNumbering.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v6/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'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml
index f49306ca2e829..fc3cc8add385a 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml
@@ -249,7 +249,7 @@
     <Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2021/v5/muonNumbering.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v6/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'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml
index f627354f7de1a..9f7c68fc48b08 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml
@@ -249,7 +249,7 @@
     <Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2021/v5/muonNumbering.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v6/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'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml
index 42957c18db546..133ea8165ec03 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml
@@ -249,7 +249,7 @@
     <Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2021/v5/muonNumbering.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v6/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'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml
index d2b3ef8f0f43c..a6c563a6a153f 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml
@@ -249,7 +249,7 @@
     <Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2021/v5/muonNumbering.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v6/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'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml
index a25628cdbcdee..cea56454b5bee 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml
@@ -249,7 +249,7 @@
     <Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2021/v5/muonNumbering.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v6/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'/>
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py
index 95c387cc9d243..dcb184d345799 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py
@@ -252,7 +252,7 @@
         'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
     )+
     cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/muonNumbering/2021/v6/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',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py
index aeef87f640c48..af20e9cea98cb 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py
@@ -252,7 +252,7 @@
         'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
     )+
     cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/muonNumbering/2021/v6/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',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py
index e1cc56aef57d8..68a2fd62989a9 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py
@@ -252,7 +252,7 @@
         'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
     )+
     cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/muonNumbering/2021/v6/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',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py
index 8c81e20abbe9c..c326f1003de98 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py
@@ -252,7 +252,7 @@
         'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
     )+
     cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/muonNumbering/2021/v6/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',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py
index 8f7c7d20cc379..1eb6bf3b281e9 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py
@@ -252,7 +252,7 @@
         'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
     )+
     cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/muonNumbering/2021/v6/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',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py
index c91eff2747ace..b8ea5ea4cccf5 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py
@@ -252,7 +252,7 @@
         'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
     )+
     cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/muonNumbering/2021/v6/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',
diff --git a/Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml b/Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml
new file mode 100644
index 0000000000000..365bbd1ef8729
--- /dev/null
+++ b/Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml
@@ -0,0 +1,504 @@
+<?xml version="1.0"?>
+<DDDefinition>
+ <ConstantsSection label="muonconstants" eval="true">
+  <Constant name="xml_starts_with_copyno" value="1"/>
+  <Constant name="level" value="1000"/>
+  <Constant name="super" value="100"/>
+  <Constant name="base" value="1"/>
+  <Constant name="mb_region" value="1*[level]"/>
+  <Constant name="mb_wheel" value="2*[level]"/>
+  <Constant name="mb_station" value="3*[level]"/>
+  <Constant name="mb_superlayer" value="4*[level]"/>
+  <Constant name="mb_layer" value="5*[level]"/>
+  <Constant name="mb_wire" value="6*[level]"/>
+  <Constant name="me_region" value="[mb_region]"/>
+  <Constant name="me_station" value="2*[level]"/>
+  <Constant name="me_subring" value="3*[level]"/>
+  <Constant name="me_sector" value="4*[level]"/>
+  <Constant name="me_ring" value="5*[level]"/>
+  <Constant name="me_layer" value="6*[level]"/>
+  <Constant name="mr_region" value="[mb_region]"/>
+  <Constant name="mr_bwheel" value="[mb_wheel]"/>
+  <Constant name="mr_bstation" value="[mb_station]"/>
+  <Constant name="mr_bplane" value="4*[level]"/>
+  <Constant name="mr_bchamber" value="5*[level]"/>
+  <Constant name="mr_estation" value="[me_station]"/>
+  <Constant name="mr_eplane" value="3*[level]"/>
+  <Constant name="mr_esector" value="4*[level]"/>
+  <Constant name="mr_eroll" value="5*[level]"/>
+  <Constant name="mg_region" value="[mb_region]"/>
+  <Constant name="mg_station" value="[me_station]"/>
+  <Constant name="mg_ring" value="3*[level]"/>
+  <Constant name="mg_sector" value="4*[level]"/>
+  <Constant name="mg_roll" value="5*[level]"/>
+ </ConstantsSection>
+ <SpecParSection label="muonregionnumbering" eval="true">
+  <SpecPar name="MuonCommonNumbering">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep0" eval="false"/>
+   <PartSelector path="//MUON"/>
+   <Parameter name="xml_starts_with_copyno" value="[xml_starts_with_copyno]"/>
+   <Parameter name="level" value="[level]"/>
+   <Parameter name="super" value="[super]"/>
+   <Parameter name="base" value="[base]"/>
+   <Parameter name="mb_region" value="[mb_region]"/>
+   <Parameter name="mb_wheel"      value="[mb_wheel]"/>
+   <Parameter name="mb_station"    value="[mb_station]"/>
+   <Parameter name="mb_superlayer" value="[mb_superlayer]"/>
+   <Parameter name="mb_layer"      value="[mb_layer]"/>
+   <Parameter name="mb_wire"       value="[mb_wire]"/>
+   <Parameter name="me_region"     value="[me_region]"/>
+   <Parameter name="me_station"    value="[me_station]"/>
+   <Parameter name="me_subring"    value="[me_subring]"/>
+   <Parameter name="me_sector"     value="[me_sector]"/>
+   <Parameter name="me_ring"       value="[me_ring]"/>
+   <Parameter name="me_layer"      value="[me_layer]"/>
+   <Parameter name="mr_region"     value="[mr_region]"/>
+   <Parameter name="mr_bwheel"     value="[mr_bwheel]"/>
+   <Parameter name="mr_bstation"   value="[mr_bstation]"/>
+   <Parameter name="mr_bplane"     value="[mr_bplane]"/>
+   <Parameter name="mr_bchamber"   value="[mr_bchamber]"/>
+   <Parameter name="mr_estation"   value="[mr_estation]"/>
+   <Parameter name="mr_eplane"     value="[mr_eplane]"/>
+   <Parameter name="mr_esector"    value="[mr_esector]"/>
+   <Parameter name="mr_eroll"      value="[mr_eroll]"/>
+   <Parameter name="mg_region"     value="[mg_region]"/>
+   <Parameter name="mg_station"    value="[mg_station]"/>
+   <Parameter name="mg_ring"       value="[mg_ring]"/>
+   <Parameter name="mg_sector"     value="[mg_sector]"/>
+   <Parameter name="mg_roll"       value="[mg_roll]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrel">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep1" eval="false"/>
+   <PartSelector path="//MB"/>
+   <Parameter name="CopyNoTag" value="[mb_region]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcap">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep2" eval="false"/>
+   <PartSelector path="//MEP"/>
+   <PartSelector path="//MEN"/>
+   <Parameter name="CopyNoTag" value="[me_region]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+ </SpecParSection>
+ <SpecParSection label="muonbarrelnumbering" eval="true">
+  <SpecPar name="MuonBarrelWheels">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep3" eval="false"/>
+   <PartSelector path="//MBWheel_.*"/>
+   <Parameter name="CopyNoTag" value="[mb_wheel]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelStation1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep4" eval="false"/>
+   <PartSelector path="//MB1N0P"/>
+   <PartSelector path="//MB1P"/>
+   <PartSelector path="//MB1P0"/>
+   <PartSelector path="//MB1ChimP"/>
+   <PartSelector path="//MB1N"/>
+   <PartSelector path="//MB1ChimN"/>
+   <Parameter name="CopyNoTag" value="[mb_station]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelStation2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep5" eval="false"/>
+   <PartSelector path="//MB2N32P"/>
+   <PartSelector path="//MB2P32P"/>
+   <PartSelector path="//MB2ChimP"/>
+   <PartSelector path="//MB2N32N"/>
+   <PartSelector path="//MB2ChimN"/>
+   <PartSelector path="//MB2P23P"/>
+   <PartSelector path="//MB2N23N"/>
+   <Parameter name="CopyNoTag" value="[mb_station]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelStation3">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep6" eval="false"/>
+   <PartSelector path="//MB3P"/>
+   <PartSelector path="//MB3N"/>
+   <PartSelector path="//MB3ChimP"/>
+   <PartSelector path="//MB3ChimN"/>
+   <Parameter name="CopyNoTag" value="[mb_station]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelStation4">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep7" eval="false"/>
+   <PartSelector path="//MB4BigLeftP"/>
+   <PartSelector path="//MB4BigRightP"/>
+   <PartSelector path="//MB4BigLeftN"/>
+   <PartSelector path="//MB4BigChimN"/>
+   <PartSelector path="//MB4BigRightN"/>
+   <PartSelector path="//MB4SmallRightP"/>
+   <PartSelector path="//MB4SmallLeftP"/>
+   <PartSelector path="//MB4SmallRightN"/>
+   <PartSelector path="//MB4SmallLeftN"/>
+   <PartSelector path="//MB4TopP"/>
+   <PartSelector path="//MB4TopChimP"/>
+   <PartSelector path="//MB4TopN"/>
+   <PartSelector path="//MB4BottomLeftP"/>
+   <PartSelector path="//MB4BottomRightP"/>
+   <PartSelector path="//MB4BottomRightN"/>
+   <PartSelector path="//MB4BottomLeftN"/>
+   <PartSelector path="//MB4FeetP"/>
+   <PartSelector path="//MB4FeetN"/>
+   <Parameter name="CopyNoTag" value="[mb_station]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelSuperLayer">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep8" eval="false"/>
+   <PartSelector path="//MB.*SuperLayer.*"/>
+   <Parameter name="CopyNoTag" value="[mb_superlayer]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelLayer">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep9" eval="false"/>
+   <PartSelector path="//MB.*SLPhiLayer.*"/>
+   <PartSelector path="//MB.*SLZLayer.*"/>
+   <Parameter name="CopyNoTag" value="[mb_layer]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelWire">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep10" eval="false"/>
+   <PartSelector path="//MBSLPhiGas"/>
+   <PartSelector path="//MBChimSLPhiGas"/>
+   <PartSelector path="//MB.*SLZGas"/>
+   <Parameter name="CopyNoTag" value="[mb_wire]"/>
+  </SpecPar>
+ </SpecParSection>
+ <SpecParSection label="muonrpcnumbering" eval="true">
+  <SpecPar name="MuonRpcPlane1I">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep11" eval="false"/>
+   <PartSelector path="//MB1RPC_IP"/>
+   <PartSelector path="//MB1RPC_IN"/>
+   <PartSelector path="//MB1ChimRPC_IP"/>
+   <PartSelector path="//MB1ChimRPC_IN"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcPlane1O">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep12" eval="false"/>
+   <PartSelector path="//MB1RPC_OP"/>
+   <PartSelector path="//MB1RPC_ON"/>
+   <PartSelector path="//MB1ChimRPC_OP"/>
+   <PartSelector path="//MB1ChimRPC_ON"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcPlane2I">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep13" eval="false"/>
+   <PartSelector path="//MB22RPC_IP"/>
+   <PartSelector path="//MB22RPC_IN"/>
+   <PartSelector path="//MB23RPC_IP"/>
+   <PartSelector path="//MB23RPC_IN"/>
+   <PartSelector path="//MB2ChimRPC_IP"/>
+   <PartSelector path="//MB2ChimRPC_IN"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcPlane2O">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep14" eval="false"/>
+   <PartSelector path="//MB22RPC_OP"/>
+   <PartSelector path="//MB22RPC_ON"/>
+   <PartSelector path="//MB23RPC_OP"/>
+   <PartSelector path="//MB23RPC_ON"/>
+   <PartSelector path="//MB2ChimRPC_OP"/>
+   <PartSelector path="//MB2ChimRPC_ON"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcPlane3S">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep15" eval="false"/>
+   <PartSelector path="//MB3RPC_P"/>
+   <PartSelector path="//MB3RPC_N"/>
+   <PartSelector path="//MB3ChimRPC_P"/>
+   <PartSelector path="//MB3ChimRPC_N"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="5*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcPlane4">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep16" eval="false"/>
+   <PartSelector path="//MB4RPC_P"/>
+   <PartSelector path="//MB4RPC_N"/>
+   <PartSelector path="//MB4SmallRPC_PS8"/>
+   <PartSelector path="//MB4SmallRPC_NS8"/>
+   <PartSelector path="//MB4SmallRPC_PS12"/>
+   <PartSelector path="//MB4SmallRPC_NS12"/>
+   <PartSelector path="//MB4TopRPC_P"/>
+   <PartSelector path="//MB4TopRPC_N"/>
+   <PartSelector path="//MB4FeetRPC_P"/>
+   <PartSelector path="//MB4FeetRPC_N"/>
+   <PartSelector path="//MB4BottomRPC_P"/>
+   <PartSelector path="//MB4BottomRPC_N"/>
+   <PartSelector path="//MB4TopChimRPC_P"/>
+   <PartSelector path="//MB4BigChimRPC_N"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="6*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcChamberLeft">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep17" eval="false"/>
+   <PartSelector path="//MB.*RPC.*GasLeft"/>
+   <Parameter name="CopyNoTag" value="[mr_bchamber]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcChamberMiddle">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep18" eval="false"/>
+   <PartSelector path="//MB.*RPC.*GasMiddle"/>
+   <Parameter name="CopyNoTag" value="[mr_bchamber]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcChamberRight">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep19" eval="false"/>
+   <PartSelector path="//MB.*RPC.*GasRight"/>
+   <Parameter name="CopyNoTag" value="[mr_bchamber]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcap1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep20" eval="false"/>
+   <PartSelector path="//RR12"/>
+   <PartSelector path="//RR12N"/>
+   <PartSelector path="//RR13"/>
+   <Parameter name="CopyNoTag" value="[mr_eplane]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcap2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep21" eval="false"/>
+   <PartSelector path="//RR2X"/>
+   <Parameter name="CopyNoTag" value="[mr_eplane]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcap3">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep22" eval="false"/>
+   <PartSelector path="//RR3X.*"/>
+   <Parameter name="CopyNoTag" value="[mr_eplane]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcap4">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep23" eval="false"/>
+   <PartSelector path="//RR4X.*"/>
+   <Parameter name="CopyNoTag" value="[mr_eplane]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapSector">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep24" eval="false"/>
+   <PartSelector path="//RT1B"/>
+   <PartSelector path="//RT1BN"/>
+   <PartSelector path="//RT1C"/>
+   <PartSelector path="//RTXU"/>
+   <PartSelector path="//RTXUR"/>
+   <PartSelector path="//RT3G"/>
+   <PartSelector path="//RT4H"/>
+   <Parameter name="CopyNoTag" value="[mr_esector]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberB1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep25" eval="false"/>
+   <PartSelector path="//REB1"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]+0"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberB2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep26" eval="false"/>
+   <PartSelector path="//REB2"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]+1"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberB3">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep27" eval="false"/>
+   <PartSelector path="//REB3"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]+2"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberC1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep28" eval="false"/>
+   <PartSelector path="//REC1"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]+0"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberC2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep29" eval="false"/>
+   <PartSelector path="//REC2"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]+1"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberC3">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep30" eval="false"/>
+   <PartSelector path="//REC3"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]+2"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberE1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep31" eval="false"/>
+   <PartSelector path="//REE1"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="5*[super]+0"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberE2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep32" eval="false"/>
+   <PartSelector path="//REE2"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="5*[super]+1"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberE3">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep33" eval="false"/>
+   <PartSelector path="//REE3"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="5*[super]+2"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberF1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep34" eval="false"/>
+   <PartSelector path="//REF1"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="6*[super]+0"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberF2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep35" eval="false"/>
+   <PartSelector path="//REF2"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="6*[super]+1"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberF3">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep36" eval="false"/>
+   <PartSelector path="//REF3"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="6*[super]+2"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberG1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep37" eval="false"/>
+   <PartSelector path="//REG1"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="7*[super]+0"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberH1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep38" eval="false"/>
+   <PartSelector path="//REH.*"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="8*[super]+0"/>
+  </SpecPar>
+ </SpecParSection>
+ <SpecParSection label="muonendcapnumbering" eval="true">
+  <SpecPar name="MuonEndcapStation1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep39" eval="false"/>
+   <PartSelector path="//ME1RingP"/>
+   <PartSelector path="//ME1RingN"/>
+   <PartSelector path="//ME12RingP"/>
+   <PartSelector path="//ME12RingN"/>
+   <PartSelector path="//ME13RingP"/>
+   <PartSelector path="//ME13RingN"/>
+   <Parameter name="CopyNoTag" value="[me_station]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapStation2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep40" eval="false"/>
+   <PartSelector path="//ME2RingP"/>
+   <PartSelector path="//ME2RingN"/>
+   <Parameter name="CopyNoTag" value="[me_station]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapStation3">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep41" eval="false"/>
+   <PartSelector path="//ME3RingP"/>
+   <PartSelector path="//ME3RingN"/>
+   <Parameter name="CopyNoTag" value="[me_station]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapStation4">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep42" eval="false"/>
+   <PartSelector path="//ME4RingP"/>
+   <PartSelector path="//ME4RingN"/>
+   <Parameter name="CopyNoTag" value="[me_station]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapSubrings">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep43" eval="false"/>
+   <PartSelector path="//ME11Space"/>
+   <PartSelector path="//ME12Space"/>
+   <PartSelector path="//ME13Space"/>
+   <PartSelector path="//ME21Space"/>
+   <PartSelector path="//ME22Space"/>
+   <PartSelector path="//ME31Space"/>
+   <PartSelector path="//ME32Space"/>
+   <PartSelector path="//ME41Space"/>
+   <PartSelector path="//ME42Space"/>
+   <Parameter name="CopyNoTag" value="[me_subring]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapSectors">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep44" eval="false"/>
+   <PartSelector path="//ME11SpaceDivision"/>
+   <PartSelector path="//ME12SpaceDivision"/>
+   <PartSelector path="//ME13SpaceDivision"/>
+   <PartSelector path="//ME21SpaceDivision"/>
+   <PartSelector path="//ME22SpaceDivision"/>
+   <PartSelector path="//ME31SpaceDivision"/>
+   <PartSelector path="//ME32SpaceDivision"/>
+   <PartSelector path="//ME41SpaceDivision"/>
+   <PartSelector path="//ME42SpaceDivision"/>
+   <Parameter name="CopyNoTag" value="[me_sector]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapLayers">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep45" eval="false"/>
+   <PartSelector path="//ME11Layer"/>
+   <PartSelector path="//ME12Layer"/>
+   <PartSelector path="//ME13Layer"/>
+   <PartSelector path="//ME21Layer"/>
+   <PartSelector path="//ME22Layer"/>
+   <PartSelector path="//ME31Layer"/>
+   <PartSelector path="//ME32Layer"/>
+   <PartSelector path="//ME41Layer"/>
+   <PartSelector path="//ME42Layer"/>
+   <Parameter name="CopyNoTag" value="[me_layer]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapRing1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep46" eval="false"/>
+   <PartSelector path="//ME11AlumFrame"/>
+   <PartSelector path="//ME21AlumFrame"/>
+   <PartSelector path="//ME31AlumFrame"/>
+   <PartSelector path="//ME41AlumFrame"/>
+   <Parameter name="CopyNoTag" value="[me_ring]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapRing2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep47" eval="false"/>
+   <PartSelector path="//ME12AlumFrame"/>
+   <PartSelector path="//ME22AlumFrame"/>
+   <PartSelector path="//ME32AlumFrame"/>
+   <PartSelector path="//ME42AlumFrame"/>
+   <Parameter name="CopyNoTag" value="[me_ring]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapRing3">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep48" eval="false"/>
+   <PartSelector path="//ME13AlumFrame"/>
+   <Parameter name="CopyNoTag" value="[me_ring]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapRingA">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep49" eval="false"/>
+   <PartSelector path="//ME1A_ActiveGasVol"/>
+   <Parameter name="CopyNoTag" value="[me_ring]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+ </SpecParSection>
+ <SpecParSection label="muonGEMnumbering" eval="true">
+  <SpecPar name="MuonGEMEndcap">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep50" eval="false"/>
+   <PartSelector path="//GEMDisk11.*"/>
+   <Parameter name="CopyNoTag" value="[mg_ring]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonGEMEndcap2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep51" eval="false"/>
+   <PartSelector path="//GEMDisk21L.*"/>
+   <Parameter name="CopyNoTag" value="[mg_ring]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonGEMSector">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep52" eval="false"/>
+   <PartSelector path="//GEMBox11.*"/>
+   <PartSelector path="//GEMBox21.*"/>
+   <Parameter name="CopyNoTag" value="[mg_sector]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonGEMChamber">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep53" eval="false"/>
+   <PartSelector path="//GHA1.*"/>
+   <PartSelector path="//GHA2.*"/>
+   <Parameter name="CopyNoTag" value="[mg_roll]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+ </SpecParSection>
+</DDDefinition>

From d88f2f8025c6a5cf4030c3fd151be53be42ef2c0 Mon Sep 17 00:00:00 2001
From: Sunanda <sunanda.banerjee@cern.ch>
Date: Sun, 25 Feb 2024 05:13:14 +0100
Subject: [PATCH 2/2] Take Vladimir's comments of shifting 2021/v6 to 2024/v1
 for muonNumbering

---
 Configuration/Geometry/python/dict2021Geometry.py               | 2 +-
 Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml  | 2 +-
 .../data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml   | 2 +-
 .../data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml   | 2 +-
 .../data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml    | 2 +-
 .../data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml    | 2 +-
 .../data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml         | 2 +-
 .../python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py  | 2 +-
 .../python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py  | 2 +-
 .../python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py   | 2 +-
 .../python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py   | 2 +-
 Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py | 2 +-
 .../python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py        | 2 +-
 .../data/muonNumbering/{2021/v6 => 2024/v1}/muonNumbering.xml   | 0
 .../MuonCommonData/python/testExtendedGeometry2024XML_cfi.py    | 2 +-
 15 files changed, 14 insertions(+), 14 deletions(-)
 rename Geometry/MuonCommonData/data/muonNumbering/{2021/v6 => 2024/v1}/muonNumbering.xml (100%)

diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
index ac710bf5008fb..c5bd42ee5a668 100644
--- a/Configuration/Geometry/python/dict2021Geometry.py
+++ b/Configuration/Geometry/python/dict2021Geometry.py
@@ -1497,7 +1497,7 @@
             'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
         ],
         2 : [
-            'Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml',
+            'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml',
         ],
         3 : [
             'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml',
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml
index 8f0d7aec07cb6..cc7f72ccbd82c 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml
@@ -249,7 +249,7 @@
     <Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2021/v6/muonNumbering.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'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml
index fc3cc8add385a..b3e0cf8d73b4c 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus05Percent.xml
@@ -249,7 +249,7 @@
     <Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2021/v6/muonNumbering.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'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml
index 9f7c68fc48b08..0b549faeffdb5 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatMinus10Percent.xml
@@ -249,7 +249,7 @@
     <Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2021/v6/muonNumbering.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'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml
index 133ea8165ec03..7e89e7f76962a 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus05Percent.xml
@@ -249,7 +249,7 @@
     <Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2021/v6/muonNumbering.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'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml
index a6c563a6a153f..ccafa1101aca3 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024FlatPlus10Percent.xml
@@ -249,7 +249,7 @@
     <Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2021/v6/muonNumbering.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'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml
index cea56454b5bee..57341e9c01b50 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024ZeroMaterial.xml
@@ -249,7 +249,7 @@
     <Include ref='Geometry/MuonCommonData/data/gem21/2024/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/2021/v6/muonNumbering.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'/>
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py
index dcb184d345799..2084a4dd0c285 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus05PercentXML_cfi.py
@@ -252,7 +252,7 @@
         'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
     )+
     cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml',
+        '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',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py
index af20e9cea98cb..af4d28d14d58c 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatMinus10PercentXML_cfi.py
@@ -252,7 +252,7 @@
         'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
     )+
     cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml',
+        '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',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py
index 68a2fd62989a9..28de997c5b4d6 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus05PercentXML_cfi.py
@@ -252,7 +252,7 @@
         'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
     )+
     cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml',
+        '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',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py
index c326f1003de98..8cb363c160f16 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024FlatPlus10PercentXML_cfi.py
@@ -252,7 +252,7 @@
         'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
     )+
     cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml',
+        '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',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py
index 1eb6bf3b281e9..b86ee3dcacb22 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py
@@ -252,7 +252,7 @@
         'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
     )+
     cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml',
+        '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',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py
index b8ea5ea4cccf5..8e6d1fea562ef 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024ZeroMaterialXML_cfi.py
@@ -252,7 +252,7 @@
         'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
     )+
     cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml',
+        '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',
diff --git a/Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml b/Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml
similarity index 100%
rename from Geometry/MuonCommonData/data/muonNumbering/2021/v6/muonNumbering.xml
rename to Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml
diff --git a/Geometry/MuonCommonData/python/testExtendedGeometry2024XML_cfi.py b/Geometry/MuonCommonData/python/testExtendedGeometry2024XML_cfi.py
index 41bcbaaee5a98..a0889d2f1f3c2 100644
--- a/Geometry/MuonCommonData/python/testExtendedGeometry2024XML_cfi.py
+++ b/Geometry/MuonCommonData/python/testExtendedGeometry2024XML_cfi.py
@@ -249,7 +249,7 @@
         'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
     )+
     cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml',
+        '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',