Merge pull request #48599 from bsunanda/Run3-gex189

Run3-gex189 Make appropriate corrections to include the missing GE11 chamber in the 2025 simulation geometry description

Author: cmsbuild

Configuration/Geometry/README.md

@@ -47,6 +47,7 @@ Muon system:
 * M14: Same as M10 with modified DTShield
 * M15: Same as M11 with modified DTShield
 * M16: Same as M12 with unmounted GE11 for 2025
+* M17: Same as M16 where the list of unmounted GE11 is correctd
 
 PPS:
 * P7: 2021 baseline (after removing overlaps and using common materials whenever possible)
@@ -82,7 +83,7 @@ Several detector combinations have been generated:
 * 2024FlatMinus10Percent = T6+C2+M11+P7+O5+F2
 * 2024FlatPlus05Percent = T7+C2+M11+P7+O5+F2
 * 2024FlatPlus10Percent = T8+C2+M11+P7+O5+F2
-* 2025 = T3+C2+M16+P8+O7+F3
+* 2025 = T3+C2+M17+P8+O7+F3
 * 2025ZeroMaterial = T4+C2+M12+P8+O8+F3
 * 2025FlatMinus05Percent = T5+C2+M12+P8+O9+F3
 * 2025FlatMinus10Percent = T6+C2+M12+P8+O9+F3

Configuration/Geometry/python/dict2021Geometry.py

@@ -2337,6 +2337,51 @@
         ],
         "era" : "run3_GEM",
     },
+    "M17" : {
+        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/v5/rpcf.xml',
+            'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
+            'Geometry/MuonCommonData/data/gem11/2025/v3/gem11.xml',
+            'Geometry/MuonCommonData/data/gem21/2025/v2/gem21.xml',
+            'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
+            'Geometry/MuonCommonData/data/mfshield/2023/v3/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 = {
@@ -2667,7 +2712,7 @@
     ("O5","T6","C2","M11","F2","P7") : "2024FlatMinus10Percent",
     ("O5","T7","C2","M11","F2","P7") : "2024FlatPlus05Percent",
     ("O5","T8","C2","M11","F2","P7") : "2024FlatPlus10Percent",
-    ("O7","T3","C2","M16","F3","P8") : "2025",
+    ("O7","T3","C2","M17","F3","P8") : "2025",
     ("O8","T4","C2","M12","F3","P8") : "2025ZeroMaterial",
     ("O9","T5","C2","M12","F3","P8") : "2025FlatMinus05Percent",
     ("O9","T6","C2","M12","F3","P8") : "2025FlatMinus10Percent",

Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2025.xml

@@ -245,7 +245,7 @@
     <Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/rpcf/2025/v5/rpcf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gem11/2025/v2/gem11.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem11/2025/v3/gem11.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gem21/2025/v2/gem21.xml'/>
     <Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mfshield/2023/v3/mfshield.xml'/>

Geometry/CMSCommonData/python/cmsExtendedGeometry2025XML_cfi.py

@@ -246,7 +246,7 @@
         'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
         'Geometry/MuonCommonData/data/rpcf/2025/v5/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
-        'Geometry/MuonCommonData/data/gem11/2025/v2/gem11.xml',
+        'Geometry/MuonCommonData/data/gem11/2025/v3/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/2025/v2/gem21.xml',
         'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
         'Geometry/MuonCommonData/data/mfshield/2023/v3/mfshield.xml',