Include the updated XML file fr ZDC to the 2023 scenario for CMS

cms-sw · Nov 9, 2023 · 725af9f · 725af9f
1 parent 7d99d30
commit 725af9f
Show file tree

Hide file tree

Showing 15 changed files with 1,905 additions and 22 deletions.
diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
@@ -42,6 +42,7 @@ 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 from ZDC group
 
 Several detector combinations have been generated:
 * 2021 = T3+C1+M1+P7+O6+F1
@@ -50,7 +51,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+F2
+* 2023ZeroMaterial = T4+C1+M1+P7+O4+F2
+* 2023FlatMinus05Percent = T5+C1+M1+P7+O5+F2
+* 2023FlatMinus10Percent = T6+C1+M1+P7+O5+F2
+* 2023FlatPlus05Percent = T7+C1+M1+P7+O5+F2
+* 2023FlatPlus10Percent = T8+C1+M1+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" : 2,
     "F1" : {
         2 : [
             'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml',
@@ -1517,7 +1517,40 @@
         "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 *',
+        ]
+    },
 }
 
 ppsDict = {
@@ -1632,13 +1665,13 @@
     ("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","C1","M2","F1","P7") : "2023",
-    ("O4","T4","C1","M2","F1","P7") : "2023ZeroMaterial",
-    ("O5","T5","C1","M2","F1","P7") : "2023FlatMinus05Percent",
-    ("O5","T6","C1","M2","F1","P7") : "2023FlatMinus10Percent",
-    ("O5","T7","C1","M2","F1","P7") : "2023FlatPlus05Percent",
-    ("O5","T8","C1","M2","F1","P7") : "2023FlatPlus10Percent",
+    ("O5","T8","C1","M1","F2","P7") : "2021FlatPlus10Percent",
+    ("O6","T3","C1","M2","F2","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",
  }
 
 deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "P1", "P2", "P3", 

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.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/v2/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus05Percent.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/v2/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus10Percent.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/v2/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatPlus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatPlus05Percent.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/v2/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatPlus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatPlus10Percent.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/v2/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023ZeroMaterial.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023ZeroMaterial.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/v2/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatMinus05PercentXML_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/v2/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/VeryForwardData/data/RP_Box.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatMinus10PercentXML_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/v2/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/VeryForwardData/data/RP_Box.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatPlus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatPlus05PercentXML_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/v2/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/VeryForwardData/data/RP_Box.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatPlus10PercentXML_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/v2/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/VeryForwardData/data/RP_Box.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_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/v2/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/VeryForwardData/data/RP_Box.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023ZeroMaterialXML_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/v2/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/VeryForwardData/data/RP_Box.xml',