Backport the fix in #43418 on ZDC geometry to update the 2023 Run3 ge…

…ometry to be used for the Heavy Ion MC
cms-sw · Dec 21, 2023 · 55c8091 · 55c8091
1 parent 4d918a6
commit 55c8091
Show file tree

Hide file tree

Showing 10 changed files with 2,941 additions and 12 deletions.
diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
@@ -42,6 +42,8 @@ The script also handles the common and forward elements of the geometry:
 * O5: as O6, but with trackermaterial removed (they are in T5, T6, T7, T8)
 * O6: 2021 baseline
 * F1: 2021 baseline
+* F2: same as F1 with modified file zdc.xmlfrom ZDC group
+* F3: same as F2 with added simulti geometry for RPD
 
 Several detector combinations have been generated:
 * 2021 = T3+C1+M1+P7+O6+F1
@@ -50,7 +52,12 @@ Several detector combinations have been generated:
 * 2021FlatMinus10Percent = T6+C1+M1+P7+O5+F1
 * 2021FlatPlus05Percent = T7+C1+M1+P7+O5+F1
 * 2021FlatPlus10Percent = T8+C1+M1+P7+O5+F1
-* 2023 = T3+C1+M2+P7+O6+F1
+* 2023 = T3+C1+M2+P7+O6+F3
+* 2023ZeroMaterial = T4+C1+M2+P7+O4+F2
+* 2023FlatMinus05Percent = T5+C1+M2+P7+O5+F2
+* 2023FlatMinus10Percent = T6+C1+M2+P7+O5+F2
+* 2023FlatPlus05Percent = T7+C1+M2+P7+O5+F2
+* 2023FlatPlus10Percent = T8+C1+M2+P7+O5+F2
 
 # Phase 2 Geometries
 

diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
@@ -1484,7 +1484,7 @@
 forwardDict = {
     "abbrev" : "F",
     "name" : "forward",
-    "default" : 1,
+    "default" : 3,
     "F1" : {
         2 : [
             'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml',
@@ -1517,7 +1517,73 @@
         "reco" :[
             'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *',
         ]
-    }
+    },
+    "F2" : {
+        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/2021/v3/zdc.xml',
+            'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.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.xml',
+        ],
+        4 : [
+            'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
+            'Geometry/ForwardSimData/data/bhmProdCuts/2021/v1/bhmProdCuts.xml',
+            'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
+        ],
+        "reco" :[
+            'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *',
+        ]
+    },
+    "F3" : {
+        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/2021/v3/zdc.xml',
+            'Geometry/ForwardCommonData/data/rpd/2021/v1/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 = {
@@ -1633,7 +1699,7 @@
     ("O5","T6","C1","M1","F1","P7") : "2021FlatMinus10Percent",
     ("O5","T7","C1","M1","F1","P7") : "2021FlatPlus05Percent",
     ("O5","T8","C1","M1","F1","P7") : "2021FlatPlus10Percent",
-    ("O6","T3","C1","M2","F1","P7") : "2023",
+    ("O6","T3","C1","M2","F3","P7") : "2023",
     ("O4","T4","C1","M2","F1","P7") : "2023ZeroMaterial",
     ("O5","T5","C1","M2","F1","P7") : "2023FlatMinus05Percent",
     ("O5","T6","C1","M2","F1","P7") : "2023FlatMinus10Percent",

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml
@@ -261,8 +261,8 @@
     <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/v2/zdc.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/rpd/2021/v1/rpd.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml'/>
@@ -369,14 +369,14 @@
     <Include ref='Geometry/ForwardCommonData/data/bhmsens.xml'/>
     <Include ref='Geometry/ForwardSimData/data/pltsens.xml'/>
     <Include ref='Geometry/ForwardSimData/data/bcm1fsens.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/zdcsens/2021/v1/zdcsens.xml'/>
     <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2021/v2/HcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
     <Include ref='Geometry/EcalSimData/data/ESProdCuts.xml'/>
     <Include ref='Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
     <Include ref='Geometry/ForwardSimData/data/bhmProdCuts/2021/v1/bhmProdCuts.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v3/zdcProdCuts.xml'/>
     <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
   </IncludeSection>
 </DDDefinition>
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py
@@ -264,8 +264,8 @@
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml',
-        'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml',
+        'Geometry/ForwardCommonData/data/rpd/2021/v1/rpd.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/VeryForwardData/data/RP_Box.xml',
         'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml',
@@ -372,14 +372,14 @@
         'Geometry/ForwardCommonData/data/bhmsens.xml',
         'Geometry/ForwardSimData/data/pltsens.xml',
         'Geometry/ForwardSimData/data/bcm1fsens.xml',
-        'Geometry/ForwardSimData/data/zdcsens.xml',
+        'Geometry/ForwardSimData/data/zdcsens/2021/v1/zdcsens.xml',
         'Geometry/HcalSimData/data/HcalProdCuts/2021/v2/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/EcalSimData/data/ESProdCuts.xml',
         'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
         'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
         'Geometry/ForwardSimData/data/bhmProdCuts/2021/v1/bhmProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts/2021/v3/zdcProdCuts.xml',
         'Geometry/CMSCommonData/data/FieldParameters.xml',
     ),
     rootNodeName = cms.string('cms:OCMS')