Fix the bug in rpc geometry - backport of the PR's #41907, #41921, #4…

…1990 from 13_2_X to 13_0_X
cms-sw · Jun 18, 2023 · a193232 · a193232
1 parent 1039d27
commit a193232
Show file tree

Hide file tree

Showing 28 changed files with 674 additions and 56 deletions.
diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
@@ -1399,7 +1399,7 @@
             '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/2021/v1/rpcf.xml',
+            'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
             'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
             'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
             'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',
@@ -1444,7 +1444,7 @@
             '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/2021/v1/rpcf.xml',
+            'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
             'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
             'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
             'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
@@ -243,7 +243,7 @@
     <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/2021/v1/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/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/2021/v1/gem21.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml
@@ -243,7 +243,7 @@
     <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/2021/v1/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/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/2021/v1/gem21.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml
@@ -243,7 +243,7 @@
     <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/2021/v1/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/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/2021/v1/gem21.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml
@@ -243,7 +243,7 @@
     <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/2021/v1/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/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/2021/v1/gem21.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
@@ -243,7 +243,7 @@
     <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/2021/v1/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/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/2021/v1/gem21.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml
@@ -243,7 +243,7 @@
     <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/2021/v1/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/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/2021/v1/gem21.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml
@@ -243,7 +243,7 @@
     <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/2021/v1/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/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/2023/v1/gem21.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus05Percent.xml
@@ -243,7 +243,7 @@
     <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/2021/v1/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/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/2023/v1/gem21.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus10Percent.xml
@@ -243,7 +243,7 @@
     <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/2021/v1/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/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/2023/v1/gem21.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatPlus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatPlus05Percent.xml
@@ -243,7 +243,7 @@
     <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/2021/v1/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/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/2023/v1/gem21.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatPlus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatPlus10Percent.xml
@@ -243,7 +243,7 @@
     <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/2021/v1/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/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/2023/v1/gem21.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023ZeroMaterial.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023ZeroMaterial.xml
@@ -243,7 +243,7 @@
     <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/2021/v1/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/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/2023/v1/gem21.xml'/>

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py
@@ -244,7 +244,7 @@
         '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/2021/v1/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py
@@ -244,7 +244,7 @@
         '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/2021/v1/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py
@@ -244,7 +244,7 @@
         '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/2021/v1/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py
@@ -244,7 +244,7 @@
         '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/2021/v1/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
@@ -244,7 +244,7 @@
         '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/2021/v1/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py
@@ -244,7 +244,7 @@
         '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/2021/v1/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatMinus05PercentXML_cfi.py
@@ -244,7 +244,7 @@
         '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/2021/v1/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatMinus10PercentXML_cfi.py
@@ -244,7 +244,7 @@
         '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/2021/v1/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatPlus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatPlus05PercentXML_cfi.py
@@ -244,7 +244,7 @@
         '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/2021/v1/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatPlus10PercentXML_cfi.py
@@ -244,7 +244,7 @@
         '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/2021/v1/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py
@@ -244,7 +244,7 @@
         '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/2021/v1/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023ZeroMaterialXML_cfi.py
@@ -244,7 +244,7 @@
         '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/2021/v1/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',