Merge pull request #48990 from bsunanda/Run3-gex190

Run3-gex190 Update the ZDC description using a new zdc.xml file from Hanna

Author: cmsbuild

Configuration/Geometry/README.md

@@ -61,8 +61,9 @@ The script also handles the common and forward elements of the geometry:
 * O8: as O4 with added material for muon shield
 * O9: as O5 with added material for muon shield
 * F1: 2021 baseline
-* F2: same as F1 with modified file zdc.xmlfrom ZDC group
+* F2: same as F1 with modified file zdc.xml from ZDC group
 * F3: same as F2 with added simulti geometry for RPD
+* F4: same as F3 with corrected version of zdc.xml from ZDC group
 
 Several detector combinations have been generated:
 * 2021 = T3+C3+M13+P7+O7+F1
@@ -83,7 +84,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+M17+P8+O7+F3
+* 2025 = T3+C2+M17+P8+O7+F4
 * 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

@@ -2387,7 +2387,7 @@
 forwardDict = {
     "abbrev" : "F",
     "name" : "forward",
-    "default" : 3,
+    "default" : 4,
     "F1" : {
         2 : [
             'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml',
@@ -2487,6 +2487,39 @@
             'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *',
         ]
     },
+    "F4" : {
+        2 : [
+            'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml',
+            'Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml',
+            'Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml',
+            'Geometry/ForwardCommonData/data/bhm.xml',
+            'Geometry/ForwardCommonData/data/pltbcm/2021/v1/pltbcm.xml',
+            'Geometry/ForwardCommonData/data/bcm1f/2021/v1/bcm1f.xml',
+            'Geometry/ForwardCommonData/data/plt/2021/v1/plt.xml',
+            'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
+            'Geometry/ForwardCommonData/data/lumimaterials.xml',
+            'Geometry/ForwardCommonData/data/zdcrotations.xml',
+            'Geometry/ForwardCommonData/data/lumirotations.xml',
+            'Geometry/ForwardCommonData/data/zdc/2025/v1/zdc.xml',
+            'Geometry/ForwardCommonData/data/rpd/2021/v2/rpd.xml',
+            'Geometry/ForwardCommonData/data/cmszdc.xml',
+        ],
+        3 : [
+            'Geometry/ForwardSimData/data/totemsensT2/2021/totemsensT2.xml',
+            'Geometry/ForwardCommonData/data/bhmsens.xml',
+            'Geometry/ForwardSimData/data/pltsens.xml',
+            'Geometry/ForwardSimData/data/bcm1fsens.xml',
+            'Geometry/ForwardSimData/data/zdcsens/2021/v1/zdcsens.xml',
+        ],
+        4 : [
+            'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
+            'Geometry/ForwardSimData/data/bhmProdCuts/2021/v1/bhmProdCuts.xml',
+            'Geometry/ForwardSimData/data/zdcProdCuts/2021/v3/zdcProdCuts.xml',
+        ],
+        "reco" :[
+            'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *',
+        ]
+    },
 }
 
 ppsDict = {
@@ -2712,7 +2745,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","M17","F3","P8") : "2025",
+    ("O7","T3","C2","M17","F4","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

@@ -261,7 +261,7 @@
     <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2025/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/rpd/2021/v2/rpd.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>

Geometry/CMSCommonData/python/cmsExtendedGeometry2025XML_cfi.py

@@ -264,7 +264,7 @@
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2025/v1/zdc.xml',
         'Geometry/ForwardCommonData/data/rpd/2021/v2/rpd.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/VeryForwardData/data/RP_Box.xml',