Merge pull request #47159 from bsunanda/Run3-gex186B

Run3-gex186B Modify all Run3 scenarios to include the modified RPC geometry
cms-sw · Jan 23, 2025 · 19f9640 · 19f9640
2 parents 4d59a2a + 94b6f89
commit 19f9640
Show file tree

Hide file tree

Showing 38 changed files with 247 additions and 63 deletions.
diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
@@ -35,6 +35,10 @@ Muon system:
 * M2: 2023 GE21 shifted in position
 * M3: 2024 with additional chambers in GE21 and iRPC31
 * M4: 2025 with additional chambers in GE21 and iRPC
+* M5: Same as M1 with modified RPC
+* M6: Same as M2 with modified RPC
+* M7: Same as M3 with modified RPC
+* M8: Same as M4 with modified RPC
 
 PPS:
 * P7: 2021 baseline (after removing overlaps and using common materials whenever possible)

diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
@@ -1616,7 +1616,7 @@
 muonDict = {
     "abbrev" : "M",
     "name" : "muon",
-    "default" : 4,
+    "default" : 8,
     "M1" : {
         1 : [
             'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
@@ -1797,6 +1797,186 @@
         ],
         "era" : "run3_GEM",
     },
+    "M5" : {
+        1 : [
+            '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/2021/v4/rpcf.xml',
+            'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
+            'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
+            'Geometry/MuonCommonData/data/gem21/2021/v2/gem21.xml',
+            'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
+            'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
+        ],
+        2 : [
+            'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml',
+        ],
+        3 : [
+            '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',
+        ],
+        4 : [
+            'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
+        ],
+        "sim" : [
+            'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
+            'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *',
+        ],
+        "reco" : [
+            '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 *',
+        ],
+        "era" : "run3_GEM",
+    },
+    "M6" : {
+        1 : [
+            '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/2021/v4/rpcf.xml',
+            'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
+            'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
+            'Geometry/MuonCommonData/data/gem21/2023/v2/gem21.xml',
+            'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
+            'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
+        ],
+        2 : [
+            'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml',
+        ],
+        3 : [
+            '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',
+        ],
+        4 : [
+            'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
+        ],
+        "sim" : [
+            'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
+            'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *',
+        ],
+        "reco" : [
+            '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 *',
+        ],
+        "era" : "run3_GEM",
+    },
+    "M7" : {
+        1 : [
+            '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/2024/v3/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/csc/2021/v3/csc.xml',
+            'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
+        ],
+        2 : [
+            'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml',
+        ],
+        3 : [
+            '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',
+        ],
+        4 : [
+            'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
+        ],
+        "sim" : [
+            'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
+            'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *',
+        ],
+        "reco" : [
+            '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 *',
+        ],
+        "era" : "run3_GEM",
+    },
+    "M8" : {
+        1 : [
+            '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/v2/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/v2/gem21.xml',
+            'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
+            'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
+        ],
+        2 : [
+            'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml',
+        ],
+        3 : [
+            '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',
+        ],
+        4 : [
+            'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
+        ],
+        "sim" : [
+            'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
+            'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *',
+        ],
+        "reco" : [
+            '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 *',
+        ],
+        "era" : "run3_GEM",
+    },
 }
 
 forwardDict = {
@@ -2011,31 +2191,31 @@
 allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict, ppsDict ]
 
 detectorVersionDict = {
-    ("O6","T3","C3","M1","F1","P7") : "2021",
-    ("O4","T4","C1","M1","F1","P7") : "2021ZeroMaterial",
-    ("O5","T5","C1","M1","F1","P7") : "2021FlatMinus05Percent",
-    ("O5","T6","C1","M1","F1","P7") : "2021FlatMinus10Percent",
-    ("O5","T7","C1","M1","F1","P7") : "2021FlatPlus05Percent",
-    ("O5","T8","C1","M1","F1","P7") : "2021FlatPlus10Percent",
-    ("O6","T3","C2","M2","F3","P7") : "2023",
-    ("O4","T4","C1","M2","F2","P7") : "2023ZeroMaterial",
-    ("O5","T5","C1","M2","F2","P7") : "2023FlatMinus05Percent",
-    ("O5","T6","C1","M2","F2","P7") : "2023FlatMinus10Percent",
-    ("O5","T7","C1","M2","F2","P7") : "2023FlatPlus05Percent",
-    ("O5","T8","C1","M2","F2","P7") : "2023FlatPlus10Percent",
-    ("O6","T3","C2","M3","F3","P7") : "2024",
-    ("O4","T4","C2","M3","F2","P7") : "2024ZeroMaterial",
-    ("O5","T5","C2","M3","F2","P7") : "2024FlatMinus05Percent",
-    ("O5","T6","C2","M3","F2","P7") : "2024FlatMinus10Percent",
-    ("O5","T7","C2","M3","F2","P7") : "2024FlatPlus05Percent",
-    ("O5","T8","C2","M3","F2","P7") : "2024FlatPlus10Percent",
-    ("O7","T3","C2","M4","F3","P7") : "2025",
-    ("O8","T4","C2","M4","F3","P7") : "2025ZeroMaterial",
-    ("O9","T5","C2","M4","F3","P7") : "2025FlatMinus05Percent",
-    ("O9","T6","C2","M4","F3","P7") : "2025FlatMinus10Percent",
-    ("O9","T7","C2","M4","F3","P7") : "2025FlatPlus05Percent",
-    ("O9","T8","C2","M4","F3","P7") : "2025FlatPlus10Percent",
+    ("O6","T3","C3","M5","F1","P7") : "2021",
+    ("O4","T4","C1","M5","F1","P7") : "2021ZeroMaterial",
+    ("O5","T5","C1","M5","F1","P7") : "2021FlatMinus05Percent",
+    ("O5","T6","C1","M5","F1","P7") : "2021FlatMinus10Percent",
+    ("O5","T7","C1","M5","F1","P7") : "2021FlatPlus05Percent",
+    ("O5","T8","C1","M5","F1","P7") : "2021FlatPlus10Percent",
+    ("O6","T3","C2","M6","F3","P7") : "2023",
+    ("O4","T4","C1","M6","F2","P7") : "2023ZeroMaterial",
+    ("O5","T5","C1","M6","F2","P7") : "2023FlatMinus05Percent",
+    ("O5","T6","C1","M6","F2","P7") : "2023FlatMinus10Percent",
+    ("O5","T7","C1","M6","F2","P7") : "2023FlatPlus05Percent",
+    ("O5","T8","C1","M6","F2","P7") : "2023FlatPlus10Percent",
+    ("O6","T3","C2","M7","F3","P7") : "2024",
+    ("O4","T4","C2","M7","F2","P7") : "2024ZeroMaterial",
+    ("O5","T5","C2","M7","F2","P7") : "2024FlatMinus05Percent",
+    ("O5","T6","C2","M7","F2","P7") : "2024FlatMinus10Percent",
+    ("O5","T7","C2","M7","F2","P7") : "2024FlatPlus05Percent",
+    ("O5","T8","C2","M7","F2","P7") : "2024FlatPlus10Percent",
+    ("O7","T3","C2","M8","F3","P7") : "2025",
+    ("O8","T4","C2","M8","F3","P7") : "2025ZeroMaterial",
+    ("O9","T5","C2","M8","F3","P7") : "2025FlatMinus05Percent",
+    ("O9","T6","C2","M8","F3","P7") : "2025FlatMinus10Percent",
+    ("O9","T7","C2","M8","F3","P7") : "2025FlatPlus05Percent",
+    ("O9","T8","C2","M8","F3","P7") : "2025FlatPlus10Percent",
  }
 
-deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "P1", "P2", "P3",
-                          "P4", "P5", "P6" ])
+deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "M1" "M2", "M3", "M4",
+                          "P1", "P2", "P3", "P4", "P5", "P6" ])
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/v2/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v4/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/v2/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/v2/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v4/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/v2/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/v2/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v4/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/v2/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/v2/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v4/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/v2/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/v2/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v4/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/v2/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/v2/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v4/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/v2/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/v2/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v4/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/v2/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/v2/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v4/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/v2/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/v2/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v4/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/v2/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/v2/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2021/v4/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/v2/gem21.xml'/>