Merge pull request #44065 from bsunanda/Run3-gex176D

Run3-gex176D Modify the RPC numbering scheme to avoid wrong DetId assignment
cms-sw · Feb 26, 2024 · a28fa8a · a28fa8a
2 parents 73614ba + d88f2f8
commit a28fa8a
Show file tree

Hide file tree

Showing 15 changed files with 518 additions and 14 deletions.
diff --git 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/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
@@ -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/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
@@ -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/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
@@ -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/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
@@ -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/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
@@ -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/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
@@ -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/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
@@ -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/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
@@ -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/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
@@ -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/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
@@ -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/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
@@ -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/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
@@ -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/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',