Skip to content

Commit 1533e0b

Browse files
author
Sunanda
committed
Add a new scenario 2026D74 with V14 HGCal and GE0
1 parent 731dad3 commit 1533e0b

File tree

9 files changed

+343
-0
lines changed

9 files changed

+343
-0
lines changed

‎Configuration/Geometry/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,6 @@ Several detector combinations have been generated:
8585
* D71 = T21+C14+M7+I11+O7+F6
8686
* D72 = T21+C11+M6+I12+O5+F4
8787
* D73 = T21+C11+M6+I13+O5+F4
88+
* D74 = T21+C14+M9+I11+O7+F6
8889

8990
D49 is the HLT TDR baseline.

‎Configuration/Geometry/python/GeometryExtended2026D74Reco_cff.py‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
# This config was generated automatically using generate2026Geometry.py
4+
# If you notice a mistake, please update the generating script, not just this config
5+
6+
from Configuration.Geometry.GeometryExtended2026D74_cff import *
7+
8+
# tracker
9+
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
10+
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
11+
from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
12+
from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
13+
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
14+
trackerGeometry.applyAlignment = cms.bool(False)
15+
16+
# calo
17+
from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *
18+
from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
19+
from Geometry.CaloEventSetup.CaloTopology_cfi import *
20+
from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
21+
CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
22+
SelectedCalos = cms.vstring("HCAL",
23+
"ZDC",
24+
"EcalBarrel",
25+
"TOWER",
26+
"HGCalEESensitive",
27+
"HGCalHESiliconSensitive",
28+
"HGCalHEScintillatorSensitive"
29+
)
30+
)
31+
from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
32+
from Geometry.HcalEventSetup.HcalGeometry_cfi import *
33+
from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
34+
from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
35+
from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
36+
from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
37+
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
38+
from Geometry.EcalMapping.EcalMapping_cfi import *
39+
from Geometry.EcalMapping.EcalMappingRecord_cfi import *
40+
41+
# muon
42+
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
43+
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
44+
from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
45+
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
46+
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
47+
48+
# forward
49+
from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
50+
51+
# timing
52+
from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
53+
from Geometry.MTDGeometryBuilder.mtdParameters_cff import *
54+
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *
55+
from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
56+
from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
57+
from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
58+
mtdGeometry.applyAlignment = cms.bool(False)
59+

‎Configuration/Geometry/python/GeometryExtended2026D74_cff.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
# This config was generated automatically using generate2026Geometry.py
4+
# If you notice a mistake, please update the generating script, not just this config
5+
6+
from Geometry.CMSCommonData.cmsExtendedGeometry2026D74XML_cfi import *
7+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
8+
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
9+
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
10+
from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
11+
from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
12+
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
13+
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *

‎Configuration/Geometry/python/dict2026Geometry.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,6 +1234,7 @@
12341234
("O7","T21","C14","M7","F6","I11") : "D71",
12351235
("O5","T21","C11","M6","F4","I12") : "D72",
12361236
("O5","T21","C11","M6","F4","I13") : "D73",
1237+
("O7","T21","C14","M9","F6","I11") : "D74",
12371238
}
12381239

12391240
deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42", "D35", "D41", "D43", "D44", "D45", "D46", "D48", "D47", "D51", "D52", "D53", "D54", "D55", "D56", "D57", "D58", "D59", "D61", "D62", "D63" ])

‎Configuration/PyReleaseValidation/python/relval_2026.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
numWFIB.extend([31834.0]) #2026D69
2929
numWFIB.extend([32234.0]) #2026D70
3030
numWFIB.extend([32634.0]) #2026D71
31+
numWFIB.extend([33034.0]) #2026D72
32+
numWFIB.extend([33434.0]) #2026D73
33+
numWFIB.extend([33834.0]) #2026D74
3134

3235
for numWF in numWFIB:
3336
workflows[numWF] = _upgrade_workflows[numWF]

‎Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@
5252
'2026D72PU',
5353
'2026D73',
5454
'2026D73PU',
55+
'2026D74',
56+
'2026D74PU',
5557
]
5658

5759
# pre-generation of WF numbers
@@ -1011,6 +1013,13 @@ def condition(self, fragment, stepList, key, hasHarvest):
10111013
'Era' : 'Phase2C11',
10121014
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
10131015
},
1016+
'2026D74' : {
1017+
'Geom' : 'Extended2026D74',
1018+
'HLTmenu': '@fake2',
1019+
'GT' : 'auto:phase2_realistic_T21',
1020+
'Era' : 'Phase2C11M9',
1021+
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
1022+
},
10141023
}
10151024

10161025
# standard PU sequences

‎Configuration/StandardSequences/python/GeometryConf.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,5 @@
4444
'Extended2026D71' : 'Extended2026D71,Extended2026D71Reco',
4545
'Extended2026D72' : 'Extended2026D72,Extended2026D72Reco',
4646
'Extended2026D73' : 'Extended2026D73,Extended2026D73Reco',
47+
'Extended2026D74' : 'Extended2026D74,Extended2026D74Reco',
4748
}

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

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
<?xml version="1.0"?>
2+
<DDDefinition>
3+
<open_geometry/>
4+
<close_geometry/>
5+
6+
<IncludeSection>
7+
<Include ref='Geometry/CMSCommonData/data/materials/2021/v1/materials.xml'/>
8+
<Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
9+
<Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
10+
<Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
11+
<Include ref='Geometry/CMSCommonData/data/cms/2026/v5/cms.xml'/>
12+
<Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
13+
<Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
14+
<Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
15+
<Include ref='Geometry/CMSCommonData/data/caloBase/2026/v5/caloBase.xml'/>
16+
<Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
17+
<Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
18+
<Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
19+
<Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
20+
<Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
21+
<Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
22+
<Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
23+
<Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
24+
<Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
25+
<Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
26+
<Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
27+
<Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
28+
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixfwd.xml'/>
29+
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml'/>
30+
<Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
31+
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml'/>
32+
<Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker800_2020_07/tracker.xml'/>
33+
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker615/pixel.xml'/>
34+
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
35+
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
36+
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml'/>
37+
<Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml'/>
38+
<Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml'/>
39+
<Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml'/>
40+
<Include ref='Geometry/TrackerRecoData/data/PhaseII/OuterTracker616_2020_04/trackerRecoMaterial.xml'/>
41+
<Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseII.xml'/>
42+
<Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml'/>
43+
<Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml'/>
44+
<Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
45+
<Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
46+
<Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
47+
<Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml'/>
48+
<Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
49+
<Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
50+
<Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
51+
<Include ref='Geometry/HcalCommonData/data/hcalrotations.xml'/>
52+
<Include ref='Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml'/>
53+
<Include ref='Geometry/HcalCommonData/data/hcalbarrelalgo.xml'/>
54+
<Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
55+
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
56+
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
57+
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml'/>
58+
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
59+
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
60+
<Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml'/>
61+
<Include ref='Geometry/HGCalCommonData/data/hgcal/v14/hgcal.xml'/>
62+
<Include ref='Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml'/>
63+
<Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml'/>
64+
<Include ref='Geometry/HGCalCommonData/data/hgcalEE/v14/hgcalEE.xml'/>
65+
<Include ref='Geometry/HGCalCommonData/data/hgcalHEsil/v14/hgcalHEsil.xml'/>
66+
<Include ref='Geometry/HGCalCommonData/data/hgcalHEmix/v14/hgcalHEmix.xml'/>
67+
<Include ref='Geometry/HGCalCommonData/data/hgcalCons/v14/hgcalCons.xml'/>
68+
<Include ref='Geometry/HGCalCommonData/data/hgcalConsData/v13/hgcalConsData.xml'/>
69+
<Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml'/>
70+
<Include ref='Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml'/>
71+
<Include ref='Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml'/>
72+
<Include ref='Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml'/>
73+
<Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
74+
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
75+
<Include ref='Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml'/>
76+
<Include ref='Geometry/MuonCommonData/data/mf/2026/v7/mf.xml'/>
77+
<Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
78+
<Include ref='Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml'/>
79+
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
80+
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
81+
<Include ref='Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml'/>
82+
<Include ref='Geometry/MuonCommonData/data/mfshield/2026/v5/mfshield.xml'/>
83+
<Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v3/ge0.xml'/>
84+
<Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml'/>
85+
<Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
86+
<Include ref='Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml'/>
87+
<Include ref='Geometry/ForwardCommonData/data/zdcmaterials.xml'/>
88+
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
89+
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
90+
<Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
91+
<Include ref='Geometry/ForwardCommonData/data/zdc.xml'/>
92+
<Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
93+
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
94+
<Include ref='Geometry/MTDCommonData/data/mtdMaterial/v1/mtdMaterial.xml'/>
95+
<Include ref='Geometry/MTDCommonData/data/btl/v1/btl.xml'/>
96+
<Include ref='Geometry/MTDCommonData/data/etl/v3/etl.xml'/>
97+
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v1/mtdStructureTopology.xml'/>
98+
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v1/mtdParameters.xml'/>
99+
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml'/>
100+
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
101+
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
102+
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
103+
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
104+
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
105+
<Include ref='Geometry/HcalSimData/data/CaloUtil.xml'/>
106+
<Include ref='Geometry/HGCalSimData/data/hgcsensv9.xml'/>
107+
<Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
108+
<Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml'/>
109+
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
110+
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
111+
<Include ref='Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml'/>
112+
<Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
113+
<Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
114+
<Include ref='Geometry/ForwardCommonData/data/brmsens.xml'/>
115+
<Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
116+
<Include ref='Geometry/MTDSimData/data/v1/mtdsens.xml'/>
117+
<Include ref='Geometry/HcalSimData/data/HcalProdCuts/2021/v1/HcalProdCuts.xml'/>
118+
<Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
119+
<Include ref='Geometry/HGCalSimData/data/hgcProdCutsv9.xml'/>
120+
<Include ref='Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml'/>
121+
<Include ref='Geometry/ForwardSimData/data/zdcProdCuts.xml'/>
122+
<Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
123+
<Include ref='Geometry/MTDSimData/data/v1/mtdProdCuts.xml'/>
124+
<Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
125+
</IncludeSection>
126+
</DDDefinition>

0 commit comments

Comments
 (0)