Merge pull request #46467 from bsunanda/Run3-hcx378

Run3-hcx378 Make 2023 Geometry scenario to accept RPD as a valid detector
cms-sw · Oct 24, 2024 · f71ff4c · f71ff4c
2 parents 5da7d06 + 8dddf08
commit f71ff4c
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 6 deletions.
diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
@@ -1459,6 +1459,75 @@
         ],
         "era" : "run3_HB",
     },
+    "C3" : {
+        1 : [
+            'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
+            'Geometry/EcalCommonData/data/eecon.xml',
+            'Geometry/EcalCommonData/data/escon.xml',
+            'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',
+            'Geometry/EcalCommonData/data/ebalgo.xml',
+            'Geometry/EcalCommonData/data/ebrot.xml',
+            'Geometry/EcalCommonData/data/eefixed/2021/v1/eefixed.xml',
+            'Geometry/EcalCommonData/data/eehier.xml',
+            'Geometry/EcalCommonData/data/eealgo.xml',
+            'Geometry/EcalCommonData/data/esalgo.xml',
+            'Geometry/EcalCommonData/data/eeF.xml',
+            'Geometry/EcalCommonData/data/eeB.xml',
+            'Geometry/EcalCommonData/data/ectkcable.xml',
+            'Geometry/HcalCommonData/data/hcalrotations.xml',
+            'Geometry/HcalCommonData/data/hcal/PhaseI/hcalalgo.xml',
+            'Geometry/HcalCommonData/data/hcalcablealgo.xml',
+            'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+            'Geometry/HcalCommonData/data/hcalendcap/PhaseI/hcalendcapalgo.xml',
+            'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
+            'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+            'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+            'Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml', 
+            'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v3/hcalRecNumbering.xml',
+        ],
+        3 : [
+            'Geometry/EcalSimData/data/ecalsens.xml',
+            'Geometry/HcalCommonData/data/hcalsens/2021/v2/hcalsenspmf.xml',
+            'Geometry/HcalSimData/data/hf.xml',
+            'Geometry/HcalSimData/data/hfpmt.xml',
+            'Geometry/HcalSimData/data/hffibrebundle.xml',
+            'Geometry/HcalSimData/data/CaloUtil/2021/v1/CaloUtil.xml',
+        ],
+        4 : [
+            'Geometry/HcalSimData/data/HcalProdCuts/2021/v2/HcalProdCuts.xml',
+            'Geometry/EcalSimData/data/EcalProdCuts.xml',
+            'Geometry/EcalSimData/data/ESProdCuts.xml',
+        ],
+        "sim" : [
+            'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *',
+            'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *',
+            'from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *',
+        ],
+        "reco" : [
+            'from Geometry.CaloEventSetup.CaloTopology_cfi import *',
+            'from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *',
+            'CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",',
+            '    SelectedCalos = cms.vstring("HCAL",',
+            '                                "ZDC",',
+            '                                "EcalBarrel",',
+            '                                "EcalEndcap",',
+            '                                "EcalPreshower",',
+            '                                "TOWER",',
+            '    )',
+            ')',
+            'from Geometry.EcalAlgo.EcalGeometry_cfi import *',
+            'from Geometry.HcalEventSetup.HcalGeometry_cfi import *',
+            'from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *',
+            'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *',
+            'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *',
+            'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *',
+            'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *',
+            'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *',
+            'from Geometry.EcalMapping.EcalMapping_cfi import *',
+            'from Geometry.EcalMapping.EcalMappingRecord_cfi import *',
+        ],
+        "era" : "run3_HB",
+    },
 }
 
 muonDict = {
@@ -1859,13 +1928,13 @@
 allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict, ppsDict ]
 
 detectorVersionDict = {
-    ("O6","T3","C1","M1","F1","P7") : "2021",
+    ("O6","T3","C3","M1","F1","P7") : "2021",
     ("O4","T4","C1","M1","F1","P7") : "2021ZeroMaterial",
     ("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","F3","P7") : "2023",
+    ("O6","T3","C2","M2","F3","P7") : "2023",
     ("O4","T4","C1","M2","F2","P7") : "2023ZeroMaterial",
     ("O5","T5","C1","M2","F2","P7") : "2023FlatMinus05Percent",
     ("O5","T6","C1","M2","F2","P7") : "2023FlatMinus10Percent",

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
@@ -234,7 +234,7 @@
     <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/v3/hcalRecNumbering.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml
@@ -234,7 +234,7 @@
     <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
     <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/v2/hcalRecNumbering.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml'/>

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
@@ -235,7 +235,7 @@
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml',
-        'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v3/hcalRecNumbering.xml',
         'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py
@@ -235,7 +235,7 @@
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml',
-        'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v2/hcalRecNumbering.xml',
         'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',