Skip to content

Commit 1b55f31

Browse files
cmsbuildcmsbuild
authored
Merge pull request #48099 from bsunanda/Phase2-hgx363AH
Phase2-hgx363AH Allow overlap checks for HGCal scenarios from V16 till V19 with the dd4hep definition
2 parents eb6319b + 3d5ac9b commit 1b55f31

File tree

6 files changed

+500
-381
lines changed

6 files changed

+500
-381
lines changed

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

Lines changed: 95 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -4,104 +4,100 @@
44
<close_geometry/>
55

66
<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/2030/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/2030/v7/caloBase.xml"/>
15-
<Include ref="Geometry/CMSCommonData/data/cmsCalo.xml"/>
16-
<Include ref="Geometry/CMSCommonData/data/muonBase/2030/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/2030/v3/beampipe.xml"/>
20-
<Include ref="Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml"/>
21-
<Include ref="Geometry/CMSCommonData/data/muonMB.xml"/>
22-
<Include ref="Geometry/CMSCommonData/data/muonMagnet.xml"/>
23-
<Include ref="Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml"/>
24-
<Include ref="Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml"/>
25-
<Include ref="Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml"/>
26-
<Include ref="Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml"/>
27-
<Include ref="Geometry/EcalCommonData/data/ectkcablemat/2030/v1/ectkcablemat.xml"/>
28-
<Include ref="Geometry/EcalCommonData/data/ebalgo.xml"/>
29-
<Include ref="Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml"/>
30-
<Include ref="Geometry/EcalCommonData/data/ebrot.xml"/>
31-
<Include ref="Geometry/HcalCommonData/data/hcalrotations.xml"/>
32-
<Include ref="Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml"/>
33-
<Include ref="Geometry/HcalCommonData/data/hcalbarrelalgo.xml"/>
34-
<Include ref="Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml"/>
35-
<Include ref="Geometry/HcalCommonData/data/hcalouteralgo.xml"/>
36-
<Include ref="Geometry/HcalCommonData/data/hcalforwardalgo.xml"/>
37-
<Include ref="Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml"/>
38-
<Include ref="Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml"/>
39-
<Include ref="Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml"/>
40-
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml"/>
41-
<Include ref="Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml"/>
42-
<Include ref="Geometry/HGCalCommonData/data/hgcalcell/v16/hgcalcell.xml"/>
43-
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcalwafer.xml"/>
44-
<Include ref="Geometry/HGCalCommonData/data/hgcalEE/v16/hgcalEE.xml"/>
45-
<Include ref="Geometry/HGCalCommonData/data/hgcalHEsil/v16/hgcalHEsil.xml"/>
46-
<Include ref="Geometry/HGCalCommonData/data/hgcalHEmix/v16/hgcalHEmix.xml"/>
47-
<Include ref="Geometry/HGCalCommonData/data/hgcalCons/v16/hgcalCons.xml"/>
48-
<Include ref="Geometry/HGCalCommonData/data/hgcalConsData/v16/hgcalConsData.xml"/>
49-
<Include ref="Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml"/>
50-
<Include ref="Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml"/>
51-
<Include ref="Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml"/>
52-
<Include ref="Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml"/>
53-
<Include ref="Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml"/>
54-
<Include ref="Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml"/>
55-
<Include ref="Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml"/>
56-
<Include ref="Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml"/>
57-
<Include ref="Geometry/MuonCommonData/data/mf/2030/v8/mf.xml"/>
58-
<Include ref="Geometry/MuonCommonData/data/csc/2021/v2/csc.xml"/>
59-
<Include ref="Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml"/>
60-
<Include ref="Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml"/>
61-
<Include ref="Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml"/>
62-
<Include ref="Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml"/>
63-
<Include ref="Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml"/>
64-
<Include ref="Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml"/>
65-
<Include ref="Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml"/>
66-
<Include ref="Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml"/>
67-
<Include ref="Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml"/>
68-
<Include ref="Geometry/ForwardCommonData/data/lumimaterials.xml"/>
69-
<Include ref="Geometry/ForwardCommonData/data/zdcrotations.xml"/>
70-
<Include ref="Geometry/ForwardCommonData/data/lumirotations.xml"/>
71-
<Include ref="Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml"/>
72-
<Include ref="Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml"/>
73-
<Include ref="Geometry/ForwardCommonData/data/cmszdc.xml"/>
74-
<Include ref="Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml"/>
75-
<Include ref="Geometry/MTDCommonData/data/btl/v1/btl.xml"/>
76-
<Include ref="Geometry/MTDCommonData/data/etl/v7/etl.xml"/>
77-
<Include ref="Geometry/MTDCommonData/data/mtdParameters/v3/mtdStructureTopology.xml"/>
78-
<Include ref="Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml"/>
79-
<Include ref="Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml"/>
80-
<Include ref="Geometry/EcalSimData/data/PhaseII/ecalsens.xml"/>
81-
<Include ref="Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml"/>
82-
<Include ref="Geometry/HcalSimData/data/hf.xml"/>
83-
<Include ref="Geometry/HcalSimData/data/hfpmt.xml"/>
84-
<Include ref="Geometry/HcalSimData/data/hffibrebundle.xml"/>
85-
<Include ref="Geometry/HcalSimData/data/CaloUtil.xml"/>
86-
<Include ref="Geometry/HGCalSimData/data/hgcsensv15.xml"/>
87-
<Include ref="Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml"/>
88-
<Include ref="Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml"/>
89-
<Include ref="Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml"/>
90-
<Include ref="Geometry/CSCGeometryBuilder/data/cscSpecs.xml"/>
91-
<Include ref="Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml"/>
92-
<Include ref="Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml"/>
93-
<Include ref="Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml"/>
94-
<Include ref="Geometry/ForwardSimData/data/zdcsens.xml"/>
95-
<Include ref="Geometry/MTDSimData/data/v2/mtdsens.xml"/>
96-
<Include ref="Geometry/HcalSimData/data/HcalProdCuts.xml"/>
97-
<Include ref="Geometry/EcalSimData/data/EcalProdCuts.xml"/>
98-
<Include ref="Geometry/HGCalSimData/data/hgcProdCutsv15.xml"/>
99-
<Include ref="Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml"/>
100-
<Include ref="Geometry/ForwardSimData/data/zdcProdCuts.xml"/>
101-
<Include ref="Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml"/>
102-
<Include ref="Geometry/MTDSimData/data/v2/mtdProdCuts.xml"/>
103-
<Include ref="Geometry/CMSCommonData/data/FieldParameters.xml"/>
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/2030/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/2030/v7/caloBase.xml'/>
15+
<Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
16+
<Include ref='Geometry/CMSCommonData/data/muonBase/2030/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/2030/v3/beampipe.xml'/>
20+
<Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
21+
<Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
22+
<Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
23+
<Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
24+
<Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
25+
<Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
26+
<Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
27+
<Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
28+
<Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
29+
<Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
30+
<Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
31+
<Include ref='Geometry/HcalCommonData/data/hcalrotations.xml'/>
32+
<Include ref='Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml'/>
33+
<Include ref='Geometry/HcalCommonData/data/hcalbarrelalgo.xml'/>
34+
<Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
35+
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml'/>
36+
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
37+
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
38+
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml'/>
39+
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
40+
<Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml'/>
41+
<Include ref='Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml'/>
42+
<Include ref='Geometry/HGCalCommonData/data/hgcalcell/v16/hgcalcell.xml'/>
43+
<Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcalwafer.xml'/>
44+
<Include ref='Geometry/HGCalCommonData/data/hgcalEE/v16/hgcalEE.xml'/>
45+
<Include ref='Geometry/HGCalCommonData/data/hgcalHEsil/v16/hgcalHEsil.xml'/>
46+
<Include ref='Geometry/HGCalCommonData/data/hgcalHEmix/v16/hgcalHEmix.xml'/>
47+
<Include ref='Geometry/HGCalCommonData/data/hgcalCons/v16/hgcalCons.xml'/>
48+
<Include ref='Geometry/HGCalCommonData/data/hgcalConsData/v16/hgcalConsData.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/2030/v3/muonYoke.xml'/>
56+
<Include ref='Geometry/MuonCommonData/data/mf/2030/v8/mf.xml'/>
57+
<Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
58+
<Include ref='Geometry/MuonCommonData/data/rpcf/2030/v4/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/2030/v1/gem21.xml'/>
62+
<Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
63+
<Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml'/>
64+
<Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
65+
<Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml'/>
66+
<Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
67+
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
68+
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
69+
<Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
70+
<Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
71+
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
72+
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
73+
<Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
74+
<Include ref='Geometry/MTDCommonData/data/etl/v8/etl.xml'/>
75+
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v5/mtdStructureTopology.xml'/>
76+
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v5/mtdParameters.xml'/>
77+
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
78+
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
79+
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml'/>
80+
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
81+
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
82+
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
83+
<Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
84+
<Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
85+
<Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
86+
<Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml'/>
87+
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
88+
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
89+
<Include ref='Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
90+
<Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
91+
<Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
92+
<Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
93+
<Include ref='Geometry/MTDSimData/data/v5/mtdsens.xml'/>
94+
<Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
95+
<Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
96+
<Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
97+
<Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
98+
<Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
99+
<Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
100+
<Include ref='Geometry/MTDSimData/data/v5/mtdProdCuts.xml'/>
101+
<Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
104102
</IncludeSection>
105-
106103
</DDDefinition>
107-

0 commit comments

Comments
 (0)