Update the scenario for 2025

Author: Sunanda

Configuration/Geometry/README.md

@@ -64,30 +64,30 @@ The script also handles the common and forward elements of the geometry:
 * F3: same as F2 with added simulti geometry for RPD
 
 Several detector combinations have been generated:
-* 2021 = T3+C3+M9+P7+O6+F1
+* 2021 = T3+C3+M13+P7+O7+F1
 * 2021ZeroMaterial = T4+C1+M9+P7+O4+F1
 * 2021FlatMinus05Percent = T5+C1+M9+P7+O5+F1
 * 2021FlatMinus10Percent = T6+C1+M9+P7+O5+F1
 * 2021FlatPlus05Percent = T7+C1+M9+P7+O5+F1
 * 2021FlatPlus10Percent = T8+C1+M9+P7+O5+F1
-* 2023 = T3+C2+M10+P7+O6+F3
+* 2023 = T3+C2+M14+P7+O7+F3
 * 2023ZeroMaterial = T4+C1+M10+P7+O4+F2
 * 2023FlatMinus05Percent = T5+C1+M10+P7+O5+F2
 * 2023FlatMinus10Percent = T6+C1+M10+P7+O5+F2
 * 2023FlatPlus05Percent = T7+C1+M10+P7+O5+F2
 * 2023FlatPlus10Percent = T8+C1+M10+P7+O5+F2
-* 2024 = T3+C2+M11+P7+O6+F3
+* 2024 = T3+C2+M15+P7+O7+F3
 * 2024ZeroMaterial = T4+C2+M11+P7+O4+F2
 * 2024FlatMinus05Percent = T5+C2+M11+P7+O5+F2
 * 2024FlatMinus10Percent = T6+C2+M11+P7+O5+F2
 * 2024FlatPlus05Percent = T7+C2+M11+P7+O5+F2
 * 2024FlatPlus10Percent = T8+C2+M11+P7+O5+F2
-* 2025 = T3+C2+M12+P7+O7+F3
-* 2025ZeroMaterial = T4+C2+M12+P7+O8+F3
-* 2025FlatMinus05Percent = T5+C2+M12+P7+O9+F3
-* 2025FlatMinus10Percent = T6+C2+M12+P7+O9+F3
-* 2025FlatPlus05Percent = T7+C2+M12+P7+O9+F3
-* 2025FlatPlus10Percent = T8+C2+M12+P7+O9+F3
+* 2025 = T3+C2+M16+P8+O7+F3
+* 2025ZeroMaterial = T4+C2+M12+P8+O8+F3
+* 2025FlatMinus05Percent = T5+C2+M12+P8+O9+F3
+* 2025FlatMinus10Percent = T6+C2+M12+P8+O9+F3
+* 2025FlatPlus05Percent = T7+C2+M12+P8+O9+F3
+* 2025FlatPlus10Percent = T8+C2+M12+P8+O9+F3
 
 # Phase 2 Geometries
 

Configuration/Geometry/python/dict2021Geometry.py

@@ -2304,7 +2304,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/v1/gem11.xml',
+            'Geometry/MuonCommonData/data/gem11/2025/v2/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',
@@ -2667,12 +2667,12 @@
     ("O5","T6","C2","M11","F2","P7") : "2024FlatMinus10Percent",
     ("O5","T7","C2","M11","F2","P7") : "2024FlatPlus05Percent",
     ("O5","T8","C2","M11","F2","P7") : "2024FlatPlus10Percent",
-    ("O7","T3","C2","M12","F3","P7") : "2025",
-    ("O8","T4","C2","M12","F3","P7") : "2025ZeroMaterial",
-    ("O9","T5","C2","M12","F3","P7") : "2025FlatMinus05Percent",
-    ("O9","T6","C2","M12","F3","P7") : "2025FlatMinus10Percent",
-    ("O9","T7","C2","M12","F3","P7") : "2025FlatPlus05Percent",
-    ("O9","T8","C2","M12","F3","P7") : "2025FlatPlus10Percent",
+    ("O7","T3","C2","M16","F3","P8") : "2025",
+    ("O8","T4","C2","M12","F3","P8") : "2025ZeroMaterial",
+    ("O9","T5","C2","M12","F3","P8") : "2025FlatMinus05Percent",
+    ("O9","T6","C2","M12","F3","P8") : "2025FlatMinus10Percent",
+    ("O9","T7","C2","M12","F3","P8") : "2025FlatPlus05Percent",
+    ("O9","T8","C2","M12","F3","P8") : "2025FlatPlus10Percent",
  }
 
 deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "M1" "M2", "M3", "M4", "M5"

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/TDR_BaseLine/gem11.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem11/2025/v2/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/TDR_BaseLine/gem11.xml',
+        'Geometry/MuonCommonData/data/gem11/2025/v2/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',