Skip to content

Commit 9eb6120

Browse files
cmsbuildcmsbuild
authored
Merge pull request #45643 from bsunanda/Phase2-hgx359I
Phase2-hgx359I: Modify some of the XML files to lead toward V19 Geometry of HGCal
2 parents de2523e + 413248e commit 9eb6120

File tree

9 files changed

+241
-17
lines changed

9 files changed

+241
-17
lines changed

‎Geometry/HGCalCommonData/data/dd4hep/testHGCalV19.xml‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
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/caloBase/2026/v6/caloBase.xml"/>
15+
<Include ref="Geometry/CMSCommonData/data/cmsCalo.xml"/>
16+
<Include ref="Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml"/>
17+
<Include ref="Geometry/CMSCommonData/data/cmsMuon.xml"/>
18+
<Include ref="Geometry/CMSCommonData/data/mgnt.xml"/>
19+
<Include ref="Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml"/>
20+
<Include ref="Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml"/>
21+
<Include ref="Geometry/CMSCommonData/data/muonMB.xml"/>
22+
<Include ref="Geometry/CMSCommonData/data/muonMagnet.xml"/>
23+
<Include ref="Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml"/>
24+
<Include ref="Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml"/>
25+
<Include ref="Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml"/>
26+
<Include ref="Geometry/EcalCommonData/data/ebalgo.xml"/>
27+
<Include ref="Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml"/>
28+
<Include ref="Geometry/EcalCommonData/data/ebrot.xml"/>
29+
<Include ref="Geometry/HcalCommonData/data/hcalrotations.xml"/>
30+
<Include ref="Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml"/>
31+
<Include ref="Geometry/HcalCommonData/data/hcalbarrelalgo.xml"/>
32+
<Include ref="Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml"/>
33+
<Include ref="Geometry/HcalCommonData/data/hcalouteralgo.xml"/>
34+
<Include ref="Geometry/HcalCommonData/data/hcalforwardalgo.xml"/>
35+
<Include ref="Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml"/>
36+
<Include ref="Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml"/>
37+
<Include ref="Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml"/>
38+
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml"/>
39+
<Include ref="Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml"/>
40+
<Include ref="Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml"/>
41+
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v19/hgcalwafer.xml"/>
42+
<Include ref="Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml"/>
43+
<Include ref="Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml"/>
44+
<Include ref="Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml"/>
45+
<Include ref="Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml"/>
46+
<Include ref="Geometry/HGCalCommonData/data/hgcalCons/v19/hgcalCons.xml"/>
47+
<Include ref="Geometry/HGCalCommonData/data/hgcalConsData/v19/hgcalConsData.xml"/>
48+
<Include ref="Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml"/>
49+
<Include ref="Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml"/>
50+
<Include ref="Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml"/>
51+
<Include ref="Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml"/>
52+
<Include ref="Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml"/>
53+
<Include ref="Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml"/>
54+
<Include ref="Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml"/>
55+
<Include ref="Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml"/>
56+
<Include ref="Geometry/MuonCommonData/data/mf/2026/v8/mf.xml"/>
57+
<Include ref="Geometry/MuonCommonData/data/csc/2021/v2/csc.xml"/>
58+
<Include ref="Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml"/>
59+
<Include ref="Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml"/>
60+
<Include ref="Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml"/>
61+
<Include ref="Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml"/>
62+
<Include ref="Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml"/>
63+
<Include ref="Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml"/>
64+
<Include ref="Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml"/>
65+
<Include ref="Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml"/>
66+
<Include ref="Geometry/EcalSimData/data/PhaseII/ecalsens.xml"/>
67+
<Include ref="Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml"/>
68+
<Include ref="Geometry/HcalSimData/data/hf.xml"/>
69+
<Include ref="Geometry/HcalSimData/data/hfpmt.xml"/>
70+
<Include ref="Geometry/HcalSimData/data/hffibrebundle.xml"/>
71+
<Include ref="Geometry/HcalSimData/data/CaloUtil.xml"/>
72+
<Include ref="Geometry/HGCalSimData/data/hgcsensv15.xml"/>
73+
<Include ref="Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml"/>
74+
<Include ref="Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml"/>
75+
<Include ref="Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml"/>
76+
<Include ref="Geometry/CSCGeometryBuilder/data/cscSpecs.xml"/>
77+
<Include ref="Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml"/>
78+
<Include ref="Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml"/>
79+
<Include ref="Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml"/>
80+
<Include ref="Geometry/HcalSimData/data/HcalProdCuts.xml"/>
81+
<Include ref="Geometry/EcalSimData/data/EcalProdCuts.xml"/>
82+
<Include ref="Geometry/HGCalSimData/data/hgcProdCutsv15.xml"/>
83+
<Include ref="Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml"/>
84+
<Include ref="Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml"/>
85+
<Include ref="Geometry/CMSCommonData/data/FieldParameters.xml"/>
86+
</IncludeSection>
87+
88+
</DDDefinition>

‎Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,8 @@
351351
HGCalEECoolingPlate, HGCalEEStainlessSteelCover, HGCalEELayerF,
352352
HGCalEELayerB</Vector>
353353
<Vector name="Thickness" type="numeric" nEntries="7">
354-
3.67*mm, 5.87*mm, 9.12*mm, 6.05*mm, 1.0*mm, [hgcal:ModuleThicknessEE],
354+
[hgcal:thickEEAbsorber1], [hgcal:thickEEAbsorber2], [hgcal:thickEEAbsorber3],
355+
[hgcal:thickEECooling], 1.0*mm, [hgcal:ModuleThicknessEE],
355356
[hgcal:ModuleThicknessEE]</Vector>
356357
<Vector name="Layers" type="numeric" nEntries="13">
357358
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5</Vector>

‎Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
materials:Copper, materials:StainlessSteel, materials:Epoxy,
7272
materials:Lead</Vector>
7373
<Vector name="LayerThickness" type="numeric" nEntries="4">
74-
0.1*mm, 0.3*mm, 0.05*mm, 2.77*mm</Vector>
74+
0.1*mm, 0.3*mm, 0.05*mm, 4.97*mm</Vector>
7575
<Vector name="LayerType" type="numeric" nEntries="7">
7676
0, 1, 2, 3, 2, 1, 0</Vector>
7777
<Numeric name="ShiftTop" value="[shiftTop]"/>
@@ -111,7 +111,7 @@
111111
materials:Copper, materials:StainlessSteel, materials:Epoxy,
112112
materials:Lead</Vector>
113113
<Vector name="LayerThickness" type="numeric" nEntries="4">
114-
0.1*mm, 0.3*mm, 0.05*mm, 2.77*mm</Vector>
114+
0.1*mm, 0.3*mm, 0.05*mm, 8.22*mm</Vector>
115115
<Vector name="LayerType" type="numeric" nEntries="7">
116116
0, 1, 2, 3, 2, 1, 0</Vector>
117117
<Numeric name="ShiftTop" value="[shiftTop]"/>

‎Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedFineCassette.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <unordered_set>
3232
#include <vector>
3333

34-
#define EDM_ML_DEBUG
34+
//#define EDM_ML_DEBUG
3535
using namespace angle_units::operators;
3636

3737
class DDHGCalMixRotatedFineCassette : public DDAlgorithm {

‎Geometry/HGCalCommonData/plugins/DDHGCalPassive.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <vector>
2222
#include <sstream>
2323

24-
// #define EDM_ML_DEBUG
24+
//#define EDM_ML_DEBUG
2525

2626
using namespace angle_units::operators;
2727

‎Geometry/HGCalCommonData/python/testHGCalV19XML_cfi.py‎

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

0 commit comments

Comments
 (0)