Skip to content

Commit f71ff4c

Browse files
cmsbuildcmsbuild
authored
Merge pull request #46467 from bsunanda/Run3-hcx378
Run3-hcx378 Make 2023 Geometry scenario to accept RPD as a valid detector
2 parents 5da7d06 + 8dddf08 commit f71ff4c

File tree

5 files changed

+75
-6
lines changed

5 files changed

+75
-6
lines changed

‎Configuration/Geometry/python/dict2021Geometry.py‎

Lines changed: 71 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,6 +1459,75 @@
14591459
],
14601460
"era" : "run3_HB",
14611461
},
1462+
"C3" : {
1463+
1 : [
1464+
'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
1465+
'Geometry/EcalCommonData/data/eecon.xml',
1466+
'Geometry/EcalCommonData/data/escon.xml',
1467+
'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',
1468+
'Geometry/EcalCommonData/data/ebalgo.xml',
1469+
'Geometry/EcalCommonData/data/ebrot.xml',
1470+
'Geometry/EcalCommonData/data/eefixed/2021/v1/eefixed.xml',
1471+
'Geometry/EcalCommonData/data/eehier.xml',
1472+
'Geometry/EcalCommonData/data/eealgo.xml',
1473+
'Geometry/EcalCommonData/data/esalgo.xml',
1474+
'Geometry/EcalCommonData/data/eeF.xml',
1475+
'Geometry/EcalCommonData/data/eeB.xml',
1476+
'Geometry/EcalCommonData/data/ectkcable.xml',
1477+
'Geometry/HcalCommonData/data/hcalrotations.xml',
1478+
'Geometry/HcalCommonData/data/hcal/PhaseI/hcalalgo.xml',
1479+
'Geometry/HcalCommonData/data/hcalcablealgo.xml',
1480+
'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
1481+
'Geometry/HcalCommonData/data/hcalendcap/PhaseI/hcalendcapalgo.xml',
1482+
'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
1483+
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
1484+
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
1485+
'Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml',
1486+
'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v3/hcalRecNumbering.xml',
1487+
],
1488+
3 : [
1489+
'Geometry/EcalSimData/data/ecalsens.xml',
1490+
'Geometry/HcalCommonData/data/hcalsens/2021/v2/hcalsenspmf.xml',
1491+
'Geometry/HcalSimData/data/hf.xml',
1492+
'Geometry/HcalSimData/data/hfpmt.xml',
1493+
'Geometry/HcalSimData/data/hffibrebundle.xml',
1494+
'Geometry/HcalSimData/data/CaloUtil/2021/v1/CaloUtil.xml',
1495+
],
1496+
4 : [
1497+
'Geometry/HcalSimData/data/HcalProdCuts/2021/v2/HcalProdCuts.xml',
1498+
'Geometry/EcalSimData/data/EcalProdCuts.xml',
1499+
'Geometry/EcalSimData/data/ESProdCuts.xml',
1500+
],
1501+
"sim" : [
1502+
'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *',
1503+
'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *',
1504+
'from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *',
1505+
],
1506+
"reco" : [
1507+
'from Geometry.CaloEventSetup.CaloTopology_cfi import *',
1508+
'from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *',
1509+
'CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",',
1510+
' SelectedCalos = cms.vstring("HCAL",',
1511+
' "ZDC",',
1512+
' "EcalBarrel",',
1513+
' "EcalEndcap",',
1514+
' "EcalPreshower",',
1515+
' "TOWER",',
1516+
' )',
1517+
')',
1518+
'from Geometry.EcalAlgo.EcalGeometry_cfi import *',
1519+
'from Geometry.HcalEventSetup.HcalGeometry_cfi import *',
1520+
'from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *',
1521+
'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *',
1522+
'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *',
1523+
'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *',
1524+
'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *',
1525+
'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *',
1526+
'from Geometry.EcalMapping.EcalMapping_cfi import *',
1527+
'from Geometry.EcalMapping.EcalMappingRecord_cfi import *',
1528+
],
1529+
"era" : "run3_HB",
1530+
},
14621531
}
14631532

14641533
muonDict = {
@@ -1859,13 +1928,13 @@
18591928
allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict, ppsDict ]
18601929

18611930
detectorVersionDict = {
1862-
("O6","T3","C1","M1","F1","P7") : "2021",
1931+
("O6","T3","C3","M1","F1","P7") : "2021",
18631932
("O4","T4","C1","M1","F1","P7") : "2021ZeroMaterial",
18641933
("O5","T5","C1","M1","F1","P7") : "2021FlatMinus05Percent",
18651934
("O5","T6","C1","M1","F1","P7") : "2021FlatMinus10Percent",
18661935
("O5","T7","C1","M1","F1","P7") : "2021FlatPlus05Percent",
18671936
("O5","T8","C1","M1","F1","P7") : "2021FlatPlus10Percent",
1868-
("O6","T3","C1","M2","F3","P7") : "2023",
1937+
("O6","T3","C2","M2","F3","P7") : "2023",
18691938
("O4","T4","C1","M2","F2","P7") : "2023ZeroMaterial",
18701939
("O5","T5","C1","M2","F2","P7") : "2023FlatMinus05Percent",
18711940
("O5","T6","C1","M2","F2","P7") : "2023FlatMinus10Percent",

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
235235
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
236236
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml'/>
237-
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml'/>
237+
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/v3/hcalRecNumbering.xml'/>
238238
<Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml'/>
239239
<Include ref='Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml'/>
240240
<Include ref='Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml'/>

‎Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
235235
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
236236
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml'/>
237-
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml'/>
237+
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/v2/hcalRecNumbering.xml'/>
238238
<Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml'/>
239239
<Include ref='Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml'/>
240240
<Include ref='Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml'/>

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
236236
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
237237
'Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml',
238-
'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml',
238+
'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v3/hcalRecNumbering.xml',
239239
'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
240240
'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
241241
'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',

‎Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
236236
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
237237
'Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml',
238-
'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml',
238+
'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v2/hcalRecNumbering.xml',
239239
'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
240240
'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml',
241241
'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml',

0 commit comments

Comments
 (0)