Skip to content

Commit 8793052

Browse files
cmsbuildcmsbuild
authored
Merge pull request #45692 from bsunanda/Phase2-hgx359L
Phase2-hgx359L Equip the correct wafer and passive module names for the V19 version of HGCal Geometry
2 parents a961243 + 49d4c52 commit 8793052

File tree

12 files changed

+611
-251
lines changed

12 files changed

+611
-251
lines changed

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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/HGCalCommonData/test/cms.xml"/>
10+
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml"/>
11+
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v18/hgcal.xml"/>
12+
<Include ref="Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml"/>
13+
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v18/hgcalwafer.xml"/>
14+
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v18/hgcalpos.xml"/>
15+
</IncludeSection>
16+
17+
</DDDefinition>
18+

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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/HGCalCommonData/test/cms.xml"/>
10+
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml"/>
11+
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v19/hgcal.xml"/>
12+
<Include ref="Geometry/HGCalCommonData/data/hgcalcell/v19/hgcalcell.xml"/>
13+
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v19/hgcalwafer.xml"/>
14+
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v19/hgcalpos.xml"/>
15+
</IncludeSection>
16+
17+
</DDDefinition>
18+

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

Lines changed: 158 additions & 122 deletions
Large diffs are not rendered by default.

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

Lines changed: 80 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -37,68 +37,86 @@
3737
<Vector name="RMaxFront" type="numeric" nEntries="4">
3838
[hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
3939
[hgcal:rMaxHGCal11]</Vector>
40-
, <Vector name="WaferNamesFull" type="string" nEntries="18">
41-
hgcalwafer:HGCalHEWafer06Fine, hgcalwafer:HGCalHEWafer07Fine,
42-
hgcalwafer:HGCalHEWafer08Fine, hgcalwafer:HGCalHEWafer09Fine,
43-
hgcalwafer:HGCalHEWafer10Fine, hgcalwafer:HGCalHEWafer11Fine,
44-
hgcalwafer:HGCalHEWafer06Coarse1, hgcalwafer:HGCalHEWafer07Coarse1,
45-
hgcalwafer:HGCalHEWafer08Coarse1, hgcalwafer:HGCalHEWafer09Coarse1,
46-
hgcalwafer:HGCalHEWafer10Coarse1, hgcalwafer:HGCalHEWafer11Coarse1,
47-
hgcalwafer:HGCalHEWafer06Coarse2, hgcalwafer:HGCalHEWafer07Coarse2,
48-
hgcalwafer:HGCalHEWafer08Coarse2, hgcalwafer:HGCalHEWafer09Coarse2,
49-
hgcalwafer:HGCalHEWafer10Coarse2, hgcalwafer:HGCalHEWafer11Coarse2</Vector>
50-
<Vector name="WaferNamesPartial" type="string" nEntries="102">
51-
hgcalwafer:HGCalHEWafer06FineHD1, hgcalwafer:HGCalHEWafer07FineHD1,
52-
hgcalwafer:HGCalHEWafer08FineHD1, hgcalwafer:HGCalHEWafer09FineHD1,
53-
hgcalwafer:HGCalHEWafer10FineHD1, hgcalwafer:HGCalHEWafer11FineHD1,
54-
hgcalwafer:HGCalHEWafer06FineHD2, hgcalwafer:HGCalHEWafer07FineHD2,
55-
hgcalwafer:HGCalHEWafer08FineHD2, hgcalwafer:HGCalHEWafer09FineHD2,
56-
hgcalwafer:HGCalHEWafer10FineHD2, hgcalwafer:HGCalHEWafer11FineHD2,
57-
hgcalwafer:HGCalHEWafer06FineHD3, hgcalwafer:HGCalHEWafer07FineHD3,
58-
hgcalwafer:HGCalHEWafer08FineHD3, hgcalwafer:HGCalHEWafer09FineHD3,
59-
hgcalwafer:HGCalHEWafer10FineHD3, hgcalwafer:HGCalHEWafer11FineHD3,
60-
hgcalwafer:HGCalHEWafer06FineHD4, hgcalwafer:HGCalHEWafer07FineHD4,
61-
hgcalwafer:HGCalHEWafer08FineHD4, hgcalwafer:HGCalHEWafer09FineHD4,
62-
hgcalwafer:HGCalHEWafer10FineHD4, hgcalwafer:HGCalHEWafer11FineHD4,
63-
hgcalwafer:HGCalHEWafer06FineHD5, hgcalwafer:HGCalHEWafer07FineHD5,
64-
hgcalwafer:HGCalHEWafer08FineHD5, hgcalwafer:HGCalHEWafer09FineHD5,
65-
hgcalwafer:HGCalHEWafer10FineHD5, hgcalwafer:HGCalHEWafer11FineHD5,
66-
hgcalwafer:HGCalHEWafer06Coarse1LD1, hgcalwafer:HGCalHEWafer07Coarse1LD1,
67-
hgcalwafer:HGCalHEWafer08Coarse1LD1, hgcalwafer:HGCalHEWafer09Coarse1LD1,
68-
hgcalwafer:HGCalHEWafer10Coarse1LD1, hgcalwafer:HGCalHEWafer11Coarse1LD1,
69-
hgcalwafer:HGCalHEWafer06Coarse1LD2, hgcalwafer:HGCalHEWafer07Coarse1LD2,
70-
hgcalwafer:HGCalHEWafer08Coarse1LD2, hgcalwafer:HGCalHEWafer09Coarse1LD2,
71-
hgcalwafer:HGCalHEWafer10Coarse1LD2, hgcalwafer:HGCalHEWafer11Coarse1LD2,
72-
hgcalwafer:HGCalHEWafer06Coarse1LD3, hgcalwafer:HGCalHEWafer07Coarse1LD3,
73-
hgcalwafer:HGCalHEWafer08Coarse1LD3, hgcalwafer:HGCalHEWafer09Coarse1LD3,
74-
hgcalwafer:HGCalHEWafer10Coarse1LD3, hgcalwafer:HGCalHEWafer11Coarse1LD3,
75-
hgcalwafer:HGCalHEWafer06Coarse1LD4, hgcalwafer:HGCalHEWafer07Coarse1LD4,
76-
hgcalwafer:HGCalHEWafer08Coarse1LD4, hgcalwafer:HGCalHEWafer09Coarse1LD4,
77-
hgcalwafer:HGCalHEWafer10Coarse1LD4, hgcalwafer:HGCalHEWafer11Coarse1LD4,
78-
hgcalwafer:HGCalHEWafer06Coarse1LD5, hgcalwafer:HGCalHEWafer07Coarse1LD5,
79-
hgcalwafer:HGCalHEWafer08Coarse1LD5, hgcalwafer:HGCalHEWafer09Coarse1LD5,
80-
hgcalwafer:HGCalHEWafer10Coarse1LD5, hgcalwafer:HGCalHEWafer11Coarse1LD5,
81-
hgcalwafer:HGCalHEWafer06Coarse1LD6, hgcalwafer:HGCalHEWafer07Coarse1LD6,
82-
hgcalwafer:HGCalHEWafer08Coarse1LD6, hgcalwafer:HGCalHEWafer09Coarse1LD6,
83-
hgcalwafer:HGCalHEWafer10Coarse1LD6, hgcalwafer:HGCalHEWafer11Coarse1LD6,
84-
hgcalwafer:HGCalHEWafer06Coarse2LD1, hgcalwafer:HGCalHEWafer07Coarse2LD1,
85-
hgcalwafer:HGCalHEWafer08Coarse2LD1, hgcalwafer:HGCalHEWafer09Coarse2LD1,
86-
hgcalwafer:HGCalHEWafer10Coarse2LD1, hgcalwafer:HGCalHEWafer11Coarse2LD1,
87-
hgcalwafer:HGCalHEWafer06Coarse2LD2, hgcalwafer:HGCalHEWafer07Coarse2LD2,
88-
hgcalwafer:HGCalHEWafer08Coarse2LD2, hgcalwafer:HGCalHEWafer09Coarse2LD2,
89-
hgcalwafer:HGCalHEWafer10Coarse2LD2, hgcalwafer:HGCalHEWafer11Coarse2LD2,
90-
hgcalwafer:HGCalHEWafer06Coarse2LD3, hgcalwafer:HGCalHEWafer07Coarse2LD3,
91-
hgcalwafer:HGCalHEWafer08Coarse2LD3, hgcalwafer:HGCalHEWafer09Coarse2LD3,
92-
hgcalwafer:HGCalHEWafer10Coarse2LD3, hgcalwafer:HGCalHEWafer11Coarse2LD3,
93-
hgcalwafer:HGCalHEWafer06Coarse2LD4, hgcalwafer:HGCalHEWafer07Coarse2LD4,
94-
hgcalwafer:HGCalHEWafer08Coarse2LD4, hgcalwafer:HGCalHEWafer09Coarse2LD4,
95-
hgcalwafer:HGCalHEWafer10Coarse2LD4, hgcalwafer:HGCalHEWafer11Coarse2LD4,
96-
hgcalwafer:HGCalHEWafer06Coarse2LD5, hgcalwafer:HGCalHEWafer07Coarse2LD5,
97-
hgcalwafer:HGCalHEWafer08Coarse2LD5, hgcalwafer:HGCalHEWafer09Coarse2LD5,
98-
hgcalwafer:HGCalHEWafer10Coarse2LD5, hgcalwafer:HGCalHEWafer11Coarse2LD5,
99-
hgcalwafer:HGCalHEWafer06Coarse2LD6, hgcalwafer:HGCalHEWafer07Coarse2LD6,
100-
hgcalwafer:HGCalHEWafer08Coarse2LD6, hgcalwafer:HGCalHEWafer09Coarse2LD6,
101-
hgcalwafer:HGCalHEWafer10Coarse2LD6, hgcalwafer:HGCalHEWafer11Coarse2LD6</Vector>
40+
, <Vector name="WaferNamesFull" type="string" nEntries="24">
41+
hgcalwafer:HGCalHEWafer06HD120, hgcalwafer:HGCalHEWafer07HD120,
42+
hgcalwafer:HGCalHEWafer08HD120, hgcalwafer:HGCalHEWafer09HD120,
43+
hgcalwafer:HGCalHEWafer10HD120, hgcalwafer:HGCalHEWafer11HD120,
44+
hgcalwafer:HGCalHEWafer06LD200, hgcalwafer:HGCalHEWafer07LD200,
45+
hgcalwafer:HGCalHEWafer08LD200, hgcalwafer:HGCalHEWafer09LD200,
46+
hgcalwafer:HGCalHEWafer10LD200, hgcalwafer:HGCalHEWafer11LD200,
47+
hgcalwafer:HGCalHEWafer06LD300, hgcalwafer:HGCalHEWafer07LD300,
48+
hgcalwafer:HGCalHEWafer08LD300, hgcalwafer:HGCalHEWafer09LD300,
49+
hgcalwafer:HGCalHEWafer10LD300, hgcalwafer:HGCalHEWafer11LD300,
50+
hgcalwafer:HGCalHEWafer06HD200, hgcalwafer:HGCalHEWafer07HD200,
51+
hgcalwafer:HGCalHEWafer08HD200, hgcalwafer:HGCalHEWafer09HD200,
52+
hgcalwafer:HGCalHEWafer10HD200, hgcalwafer:HGCalHEWafer11HD200</Vector>
53+
<Vector name="WaferNamesPartial" type="string" nEntries="132">
54+
hgcalwafer:HGCalHEWafer06HD120HD1, hgcalwafer:HGCalHEWafer07HD120HD1,
55+
hgcalwafer:HGCalHEWafer08HD120HD1, hgcalwafer:HGCalHEWafer09HD120HD1,
56+
hgcalwafer:HGCalHEWafer10HD120HD1, hgcalwafer:HGCalHEWafer11HD120HD1,
57+
hgcalwafer:HGCalHEWafer06HD120HD2, hgcalwafer:HGCalHEWafer07HD120HD2,
58+
hgcalwafer:HGCalHEWafer08HD120HD2, hgcalwafer:HGCalHEWafer09HD120HD2,
59+
hgcalwafer:HGCalHEWafer10HD120HD2, hgcalwafer:HGCalHEWafer11HD120HD2,
60+
hgcalwafer:HGCalHEWafer06HD120HD3, hgcalwafer:HGCalHEWafer07HD120HD3,
61+
hgcalwafer:HGCalHEWafer08HD120HD3, hgcalwafer:HGCalHEWafer09HD120HD3,
62+
hgcalwafer:HGCalHEWafer10HD120HD3, hgcalwafer:HGCalHEWafer11HD120HD3,
63+
hgcalwafer:HGCalHEWafer06HD120HD4, hgcalwafer:HGCalHEWafer07HD120HD4,
64+
hgcalwafer:HGCalHEWafer08HD120HD4, hgcalwafer:HGCalHEWafer09HD120HD4,
65+
hgcalwafer:HGCalHEWafer10HD120HD4, hgcalwafer:HGCalHEWafer11HD120HD4,
66+
hgcalwafer:HGCalHEWafer06HD120HD5, hgcalwafer:HGCalHEWafer07HD120HD5,
67+
hgcalwafer:HGCalHEWafer08HD120HD5, hgcalwafer:HGCalHEWafer09HD120HD5,
68+
hgcalwafer:HGCalHEWafer10HD120HD5, hgcalwafer:HGCalHEWafer11HD120HD5,
69+
hgcalwafer:HGCalHEWafer06LD200LD1, hgcalwafer:HGCalHEWafer07LD200LD1,
70+
hgcalwafer:HGCalHEWafer08LD200LD1, hgcalwafer:HGCalHEWafer09LD200LD1,
71+
hgcalwafer:HGCalHEWafer10LD200LD1, hgcalwafer:HGCalHEWafer11LD200LD1,
72+
hgcalwafer:HGCalHEWafer06LD200LD2, hgcalwafer:HGCalHEWafer07LD200LD2,
73+
hgcalwafer:HGCalHEWafer08LD200LD2, hgcalwafer:HGCalHEWafer09LD200LD2,
74+
hgcalwafer:HGCalHEWafer10LD200LD2, hgcalwafer:HGCalHEWafer11LD200LD2,
75+
hgcalwafer:HGCalHEWafer06LD200LD3, hgcalwafer:HGCalHEWafer07LD200LD3,
76+
hgcalwafer:HGCalHEWafer08LD200LD3, hgcalwafer:HGCalHEWafer09LD200LD3,
77+
hgcalwafer:HGCalHEWafer10LD200LD3, hgcalwafer:HGCalHEWafer11LD200LD3,
78+
hgcalwafer:HGCalHEWafer06LD200LD4, hgcalwafer:HGCalHEWafer07LD200LD4,
79+
hgcalwafer:HGCalHEWafer08LD200LD4, hgcalwafer:HGCalHEWafer09LD200LD4,
80+
hgcalwafer:HGCalHEWafer10LD200LD4, hgcalwafer:HGCalHEWafer11LD200LD4,
81+
hgcalwafer:HGCalHEWafer06LD200LD5, hgcalwafer:HGCalHEWafer07LD200LD5,
82+
hgcalwafer:HGCalHEWafer08LD200LD5, hgcalwafer:HGCalHEWafer09LD200LD5,
83+
hgcalwafer:HGCalHEWafer10LD200LD5, hgcalwafer:HGCalHEWafer11LD200LD5,
84+
hgcalwafer:HGCalHEWafer06LD200LD6, hgcalwafer:HGCalHEWafer07LD200LD6,
85+
hgcalwafer:HGCalHEWafer08LD200LD6, hgcalwafer:HGCalHEWafer09LD200LD6,
86+
hgcalwafer:HGCalHEWafer10LD200LD6, hgcalwafer:HGCalHEWafer11LD200LD6,
87+
hgcalwafer:HGCalHEWafer06LD300LD1, hgcalwafer:HGCalHEWafer07LD300LD1,
88+
hgcalwafer:HGCalHEWafer08LD300LD1, hgcalwafer:HGCalHEWafer09LD300LD1,
89+
hgcalwafer:HGCalHEWafer10LD300LD1, hgcalwafer:HGCalHEWafer11LD300LD1,
90+
hgcalwafer:HGCalHEWafer06LD300LD2, hgcalwafer:HGCalHEWafer07LD300LD2,
91+
hgcalwafer:HGCalHEWafer08LD300LD2, hgcalwafer:HGCalHEWafer09LD300LD2,
92+
hgcalwafer:HGCalHEWafer10LD300LD2, hgcalwafer:HGCalHEWafer11LD300LD2,
93+
hgcalwafer:HGCalHEWafer06LD300LD3, hgcalwafer:HGCalHEWafer07LD300LD3,
94+
hgcalwafer:HGCalHEWafer08LD300LD3, hgcalwafer:HGCalHEWafer09LD300LD3,
95+
hgcalwafer:HGCalHEWafer10LD300LD3, hgcalwafer:HGCalHEWafer11LD300LD3,
96+
hgcalwafer:HGCalHEWafer06LD300LD4, hgcalwafer:HGCalHEWafer07LD300LD4,
97+
hgcalwafer:HGCalHEWafer08LD300LD4, hgcalwafer:HGCalHEWafer09LD300LD4,
98+
hgcalwafer:HGCalHEWafer10LD300LD4, hgcalwafer:HGCalHEWafer11LD300LD4,
99+
hgcalwafer:HGCalHEWafer06LD300LD5, hgcalwafer:HGCalHEWafer07LD300LD5,
100+
hgcalwafer:HGCalHEWafer08LD300LD5, hgcalwafer:HGCalHEWafer09LD300LD5,
101+
hgcalwafer:HGCalHEWafer10LD300LD5, hgcalwafer:HGCalHEWafer11LD300LD5,
102+
hgcalwafer:HGCalHEWafer06LD300LD6, hgcalwafer:HGCalHEWafer07LD300LD6,
103+
hgcalwafer:HGCalHEWafer08LD300LD6, hgcalwafer:HGCalHEWafer09LD300LD6,
104+
hgcalwafer:HGCalHEWafer10LD300LD6, hgcalwafer:HGCalHEWafer11LD300LD6,
105+
hgcalwafer:HGCalHEWafer06HD200HD1, hgcalwafer:HGCalHEWafer07HD200HD1,
106+
hgcalwafer:HGCalHEWafer08HD200HD1, hgcalwafer:HGCalHEWafer09HD200HD1,
107+
hgcalwafer:HGCalHEWafer10HD200HD1, hgcalwafer:HGCalHEWafer11HD200HD1,
108+
hgcalwafer:HGCalHEWafer06HD200HD2, hgcalwafer:HGCalHEWafer07HD200HD2,
109+
hgcalwafer:HGCalHEWafer08HD200HD2, hgcalwafer:HGCalHEWafer09HD200HD2,
110+
hgcalwafer:HGCalHEWafer10HD200HD2, hgcalwafer:HGCalHEWafer11HD200HD2,
111+
hgcalwafer:HGCalHEWafer06HD200HD3, hgcalwafer:HGCalHEWafer07HD200HD3,
112+
hgcalwafer:HGCalHEWafer08HD200HD3, hgcalwafer:HGCalHEWafer09HD200HD3,
113+
hgcalwafer:HGCalHEWafer10HD200HD3, hgcalwafer:HGCalHEWafer11HD200HD3,
114+
hgcalwafer:HGCalHEWafer06HD200HD4, hgcalwafer:HGCalHEWafer07HD200HD4,
115+
hgcalwafer:HGCalHEWafer08HD200HD4, hgcalwafer:HGCalHEWafer09HD200HD4,
116+
hgcalwafer:HGCalHEWafer10HD200HD4, hgcalwafer:HGCalHEWafer11HD200HD4,
117+
hgcalwafer:HGCalHEWafer06HD200HD5, hgcalwafer:HGCalHEWafer07HD200HD5,
118+
hgcalwafer:HGCalHEWafer08HD200HD5, hgcalwafer:HGCalHEWafer09HD200HD5,
119+
hgcalwafer:HGCalHEWafer10HD200HD5, hgcalwafer:HGCalHEWafer11HD200HD5</Vector>
102120
<Vector name="PassiveNamesFull" type="string" nEntries="252">
103121
hgcalPassive:HGCalHEPassiveL01F00, hgcalPassive:HGCalHEPassiveL01F01,
104122
hgcalPassive:HGCalHEPassiveL01F02, hgcalPassive:HGCalHEPassiveL01F03,

0 commit comments

Comments
 (0)