Skip to content

Commit 3d8aa9e

Browse files
cmsbuildcmsbuild
authored
Merge pull request #45668 from bsunanda/Phase2-hgx359J
Phase2-hgx359J Add new code for V19 version of HGCal geometry
2 parents 4958859 + 391407c commit 3d8aa9e

File tree

10 files changed

+1088
-428
lines changed

10 files changed

+1088
-428
lines changed

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,29 @@
139139
<Constant name="thickEEModule1" value="28.37*mm"/>
140140
<Constant name="thickEEModule2" value="30.57*mm"/>
141141
<Constant name="thickEEModule3" value="33.82*mm"/>
142+
<Constant name="thickEEModule4" value="34.82*mm"/>
142143
<Constant name="thickEEAbsorber1" value="3.67*mm"/>
143144
<Constant name="thickEEAbsorber2" value="5.87*mm"/>
144145
<Constant name="thickEEAbsorber3" value="9.12*mm"/>
145146
<Constant name="thickEECooling" value="6.05*mm"/>
146147
<Constant name="nEEModule1" value="1"/>
147148
<Constant name="nEEModule2" value="8"/>
148149
<Constant name="nEEModule3" value="4"/>
150+
<Constant name="thickHEModule1" value="67.80*mm"/>
151+
<Constant name="thickHEModule2" value="63.05*mm"/>
152+
<Constant name="thickHEModule3" value="82.25*mm"/>
153+
<Constant name="thickHEAbsorber1" value="45.0*mm"/>
154+
<Constant name="thickHEAbsorber2" value="41.5*mm"/>
155+
<Constant name="thickHEAbsorber3" value="60.7*mm"/>
156+
<Constant name="thickHEAirGap" value="1.25*mm"/>
157+
<Constant name="thickHESteelCover" value="2.5*mm"/>
158+
<Constant name="thickHEService" value="4.0*mm"/>
159+
<Constant name="thickHEShift1" value="([thickHEAbsorber1] + [thickHEService] + [thickHEAirGap])"/>
160+
<Constant name="thickHEShift2" value="([thickHEAbsorber2] + [thickHEService])"/>
161+
<Constant name="thickHEShift3" value="([thickHEAbsorber3] + [thickHEService])"/>
162+
<Constant name="thickHECooling" value="6.35*mm"/>
163+
<Constant name="nHEModule1" value="1"/>
164+
<Constant name="nHEModule2" value="4"/>
149165
</ConstantsSection>
150166

151167
<RotationSection label="hgcal.xml">

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<Numeric name="FirstLayer" value="1"/>
1414
<Numeric name="AbsorberMode" value="0"/>
1515
<Numeric name="SensitiveMode" value="0"/>
16+
<Numeric name="PassiveMode" value="0"/>
1617
<Numeric name="zMinBlock" value="[hgcal:zHGCalEE1]"/>
1718
<Numeric name="waferSize" value="[hgcal:WaferSize]"/>
1819
<Numeric name="SensorSeparation" value="[hgcal:SensorSeparation]"/>

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

Lines changed: 100 additions & 218 deletions
Large diffs are not rendered by default.

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

Lines changed: 269 additions & 47 deletions
Large diffs are not rendered by default.

‎Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<Numeric name="FirstLayer" value="1"/>
1414
<Numeric name="AbsorberMode" value="1"/>
1515
<Numeric name="SensitiveMode" value="1"/>
16+
<Numeric name="PassiveMode" value="0"/>
1617
<Numeric name="zMinBlock" value="[hgcal:zHGCalHEsil1]"/>
1718
<Numeric name="waferSize" value="[hgcal:WaferSize]"/>
1819
<Numeric name="SensorSeparation" value="[hgcal:SensorSeparation]"/>

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

Lines changed: 268 additions & 47 deletions
Large diffs are not rendered by default.

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

Lines changed: 246 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@
1010
<Constant name="zMinBlockEEC1" value="([zMinBlockEE1] + [hgcal:thickEEModule1] - [hgcal:thickEECooling])"/>
1111
<Constant name="zMinBlockEEC2" value="([zMinBlockEE2] + [hgcal:thickEEModule2] - [hgcal:thickEECooling])"/>
1212
<Constant name="zMinBlockEEC3" value="([zMinBlockEE3] + [hgcal:thickEEModule3] - [hgcal:thickEECooling])"/>
13+
<Constant name="zMinBlockHE1" value="([hgcal:zHGCalHEsil1] + [hgcal:thickHEShift1])"/>
14+
<Constant name="zMinBlockHEC1" value="([zMinBlockHE1] + [hgcal:ModuleThicknessHE] + [hgcal:thickHESteelCover])"/>
15+
<Constant name="zMinBlockHE2" value="([zMinBlockHEC1] + [hgcal:ModuleThicknessHE] + [hgcal:thickHEShift2])"/>
16+
<Constant name="zMinBlockHEC2" value="([zMinBlockHE2] + [hgcal:ModuleThicknessHE] + [hgcal:thickHESteelCover])"/>
17+
<Constant name="zMinBlockHE3" value="([hgcal:zHGCalHEmix1] + [hgcal:thickHEShift2])"/>
18+
<Constant name="zMinBlockHEC3" value="([zMinBlockHE3] + [hgcal:ModuleThicknessHE] + [hgcal:thickHESteelCover])"/>
19+
<Constant name="zMinBlockHE4" value="([zMinBlockHEC3] + [hgcal:ModuleThicknessHE] + [hgcal:thickHESteelCover] +
20+
[hgcal:thickHEModule2] * ([hgcal:nHEModule2] - 1) + [hgcal:thickHEShift3])"/>
21+
<Constant name="zMinBlockHEC4" value="([zMinBlockHE4] + [hgcal:ModuleThicknessHE] + [hgcal:thickHESteelCover])"/>
1322
</ConstantsSection>
1423

1524
<PosPartSection label="hgcalPassive.xml" eval="true">
@@ -150,7 +159,7 @@
150159
<Vector name="LayerMaterials" type="string" nEntries="1">
151160
materials:Copper</Vector>
152161
<Vector name="LayerThickness" type="numeric" nEntries="1">
153-
6.05*mm</Vector>
162+
[hgcal:thickEECooling]</Vector>
154163
<Vector name="LayerType" type="numeric" nEntries="0">
155164
</Vector>
156165
<Numeric name="ShiftTop" value="[shiftTop]"/>
@@ -189,7 +198,7 @@
189198
<Vector name="LayerMaterials" type="string" nEntries="1">
190199
materials:Copper</Vector>
191200
<Vector name="LayerThickness" type="numeric" nEntries="1">
192-
6.05*mm</Vector>
201+
[hgcal:thickEECooling]</Vector>
193202
<Vector name="LayerType" type="numeric" nEntries="0">
194203
</Vector>
195204
<Numeric name="ShiftTop" value="[shiftTop]"/>
@@ -228,7 +237,241 @@
228237
<Vector name="LayerMaterials" type="string" nEntries="1">
229238
materials:Copper</Vector>
230239
<Vector name="LayerThickness" type="numeric" nEntries="1">
231-
6.05*mm</Vector>
240+
[hgcal:thickEECooling]</Vector>
241+
<Vector name="LayerType" type="numeric" nEntries="0">
242+
</Vector>
243+
<Numeric name="ShiftTop" value="[shiftTop]"/>
244+
<Numeric name="ShiftBottom" value="[shiftBottom]"/>
245+
<Vector name="SlopeBottom" type="numeric" nEntries="4">
246+
0, 0, 0, 0</Vector>
247+
<Vector name="ZFrontBottom" type="numeric" nEntries="4">
248+
[hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
249+
[hgcal:zHGCal8]</Vector>
250+
<Vector name="RMinFront" type="numeric" nEntries="4">
251+
[hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
252+
[hgcal:rMinHGCal6], [hgcal:rMinHGCal8]</Vector>
253+
<Vector name="SlopeTop" type="numeric" nEntries="4">
254+
[hgcal:slope1], [hgcal:slope3], 0, 0</Vector>
255+
<Vector name="ZFrontTop" type="numeric" nEntries="4">
256+
[hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
257+
[hgcal:zHGCal11]</Vector>
258+
<Vector name="RMaxFront" type="numeric" nEntries="4">
259+
[hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
260+
[hgcal:rMaxHGCal11]</Vector>
261+
</Algorithm>
262+
<Algorithm name="hgcal:DDHGCalPassive">
263+
<rParent name="hgcalPassive:HGCalHEPassive"/>
264+
<String name="ModuleMaterial" value="materials:Air"/>
265+
<Numeric name="Thickness" value="[hgcal:thickHEAbsorber1]"/>
266+
<Numeric name="zMinBlock" value="[zMinBlockHE1]"/>
267+
<Numeric name="ModuleThick" value="[hgcal:thickHEModule1]"/>
268+
<Numeric name="Parts" value="1"/>
269+
<Numeric name="PhiStart" value="0"/>
270+
<Vector name="TagLayer" type="string" nEntries="1">
271+
L01</Vector>
272+
<Vector name="TagSector" type="string" nEntries="12">
273+
F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11</Vector>
274+
<Vector name="LayerNames" type="string" nEntries="1">
275+
StainlessSteel</Vector>
276+
<Vector name="LayerMaterials" type="string" nEntries="1">
277+
materials:StainlessSteel</Vector>
278+
<Vector name="LayerThickness" type="numeric" nEntries="1">
279+
[hgcal:thickHEAbsorber1]</Vector>
280+
<Vector name="LayerType" type="numeric" nEntries="1">
281+
0</Vector>
282+
<Numeric name="ShiftTop" value="[shiftTop]"/>
283+
<Numeric name="ShiftBottom" value="[shiftBottom]"/>
284+
<Vector name="SlopeBottom" type="numeric" nEntries="4">
285+
0, 0, 0, 0</Vector>
286+
<Vector name="ZFrontBottom" type="numeric" nEntries="4">
287+
[hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
288+
[hgcal:zHGCal8]</Vector>
289+
<Vector name="RMinFront" type="numeric" nEntries="4">
290+
[hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
291+
[hgcal:rMinHGCal6], [hgcal:rMinHGCal8]</Vector>
292+
<Vector name="SlopeTop" type="numeric" nEntries="4">
293+
[hgcal:slope1], [hgcal:slope3], 0, 0</Vector>
294+
<Vector name="ZFrontTop" type="numeric" nEntries="4">
295+
[hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
296+
[hgcal:zHGCal11]</Vector>
297+
<Vector name="RMaxFront" type="numeric" nEntries="4">
298+
[hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
299+
[hgcal:rMaxHGCal11]</Vector>
300+
</Algorithm>
301+
<Algorithm name="hgcal:DDHGCalPassive">
302+
<rParent name="hgcalPassive:HGCalHEPassive"/>
303+
<String name="ModuleMaterial" value="materials:Air"/>
304+
<Numeric name="Thickness" value="[hgcal:thickHEAbsorber2]"/>
305+
<Numeric name="zMinBlock" value="[zMinBlockHE2]"/>
306+
<Numeric name="ModuleThick" value="[hgcal:thickHEModule2]"/>
307+
<Numeric name="Parts" value="1"/>
308+
<Numeric name="PhiStart" value="0"/>
309+
<Vector name="TagLayer" type="string" nEntries="10">
310+
L02, L03, L04, L05, L06, L07, L08, L09, L10, L11</Vector>
311+
<Vector name="TagSector" type="string" nEntries="12">
312+
F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11</Vector>
313+
<Vector name="LayerNames" type="string" nEntries="1">
314+
StainlessSteel</Vector>
315+
<Vector name="LayerMaterials" type="string" nEntries="1">
316+
materials:StainlessSteel</Vector>
317+
<Vector name="LayerThickness" type="numeric" nEntries="1">
318+
[hgcal:thickHEAbsorber2]</Vector>
319+
<Vector name="LayerType" type="numeric" nEntries="1">
320+
0</Vector>
321+
<Numeric name="ShiftTop" value="[shiftTop]"/>
322+
<Numeric name="ShiftBottom" value="[shiftBottom]"/>
323+
<Vector name="SlopeBottom" type="numeric" nEntries="4">
324+
0, 0, 0, 0</Vector>
325+
<Vector name="ZFrontBottom" type="numeric" nEntries="4">
326+
[hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
327+
[hgcal:zHGCal8]</Vector>
328+
<Vector name="RMinFront" type="numeric" nEntries="4">
329+
[hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
330+
[hgcal:rMinHGCal6], [hgcal:rMinHGCal8]</Vector>
331+
<Vector name="SlopeTop" type="numeric" nEntries="4">
332+
[hgcal:slope1], [hgcal:slope3], 0, 0</Vector>
333+
<Vector name="ZFrontTop" type="numeric" nEntries="4">
334+
[hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
335+
[hgcal:zHGCal11]</Vector>
336+
<Vector name="RMaxFront" type="numeric" nEntries="4">
337+
[hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
338+
[hgcal:rMaxHGCal11]</Vector>
339+
</Algorithm>
340+
<Algorithm name="hgcal:DDHGCalPassive">
341+
<rParent name="hgcalPassive:HGCalHEPassive"/>
342+
<String name="ModuleMaterial" value="materials:Air"/>
343+
<Numeric name="Thickness" value="[hgcal:thickHEAbsorber3]"/>
344+
<Numeric name="zMinBlock" value="[zMinBlockHE4]"/>
345+
<Numeric name="ModuleThick" value="[hgcal:thickHEModule3]"/>
346+
<Numeric name="Parts" value="1"/>
347+
<Numeric name="PhiStart" value="0"/>
348+
<Vector name="TagLayer" type="string" nEntries="10">
349+
L12, L13, L14, L15, L16, L17, L18, L19, L20, L21</Vector>
350+
<Vector name="TagSector" type="string" nEntries="12">
351+
F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11</Vector>
352+
<Vector name="LayerNames" type="string" nEntries="1">
353+
StainlessSteel</Vector>
354+
<Vector name="LayerMaterials" type="string" nEntries="1">
355+
materials:StainlessSteel</Vector>
356+
<Vector name="LayerThickness" type="numeric" nEntries="1">
357+
[hgcal:thickHEAbsorber3]</Vector>
358+
<Vector name="LayerType" type="numeric" nEntries="1">
359+
0</Vector>
360+
<Numeric name="ShiftTop" value="[shiftTop]"/>
361+
<Numeric name="ShiftBottom" value="[shiftBottom]"/>
362+
<Vector name="SlopeBottom" type="numeric" nEntries="4">
363+
0, 0, 0, 0</Vector>
364+
<Vector name="ZFrontBottom" type="numeric" nEntries="4">
365+
[hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
366+
[hgcal:zHGCal8]</Vector>
367+
<Vector name="RMinFront" type="numeric" nEntries="4">
368+
[hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
369+
[hgcal:rMinHGCal6], [hgcal:rMinHGCal8]</Vector>
370+
<Vector name="SlopeTop" type="numeric" nEntries="4">
371+
[hgcal:slope1], [hgcal:slope3], 0, 0</Vector>
372+
<Vector name="ZFrontTop" type="numeric" nEntries="4">
373+
[hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
374+
[hgcal:zHGCal11]</Vector>
375+
<Vector name="RMaxFront" type="numeric" nEntries="4">
376+
[hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
377+
[hgcal:rMaxHGCal11]</Vector>
378+
</Algorithm>
379+
<Algorithm name="hgcal:DDHGCalPassive">
380+
<rParent name="hgcalPassive:HGCalHECoolingPlate"/>
381+
<String name="ModuleMaterial" value="materials:Copper"/>
382+
<Numeric name="Thickness" value="[hgcal:thickHECooling]"/>
383+
<Numeric name="zMinBlock" value="[zMinBlockHEC1]"/>
384+
<Numeric name="ModuleThick" value="[hgcal:thickHEModule1]"/>
385+
<Numeric name="Parts" value="1"/>
386+
<Numeric name="PhiStart" value="0"/>
387+
<Vector name="TagLayer" type="string" nEntries="1">
388+
L01</Vector>
389+
<Vector name="TagSector" type="string" nEntries="12">
390+
F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11</Vector>
391+
<Vector name="LayerNames" type="string" nEntries="1">
392+
Copper</Vector>
393+
<Vector name="LayerMaterials" type="string" nEntries="1">
394+
materials:Copper</Vector>
395+
<Vector name="LayerThickness" type="numeric" nEntries="1">
396+
[hgcal:thickHECooling]</Vector>
397+
<Vector name="LayerType" type="numeric" nEntries="0">
398+
</Vector>
399+
<Numeric name="ShiftTop" value="[shiftTop]"/>
400+
<Numeric name="ShiftBottom" value="[shiftBottom]"/>
401+
<Vector name="SlopeBottom" type="numeric" nEntries="4">
402+
0, 0, 0, 0</Vector>
403+
<Vector name="ZFrontBottom" type="numeric" nEntries="4">
404+
[hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
405+
[hgcal:zHGCal8]</Vector>
406+
<Vector name="RMinFront" type="numeric" nEntries="4">
407+
[hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
408+
[hgcal:rMinHGCal6], [hgcal:rMinHGCal8]</Vector>
409+
<Vector name="SlopeTop" type="numeric" nEntries="4">
410+
[hgcal:slope1], [hgcal:slope3], 0, 0</Vector>
411+
<Vector name="ZFrontTop" type="numeric" nEntries="4">
412+
[hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
413+
[hgcal:zHGCal11]</Vector>
414+
<Vector name="RMaxFront" type="numeric" nEntries="4">
415+
[hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
416+
[hgcal:rMaxHGCal11]</Vector>
417+
</Algorithm>
418+
<Algorithm name="hgcal:DDHGCalPassive">
419+
<rParent name="hgcalPassive:HGCalHECoolingPlate"/>
420+
<String name="ModuleMaterial" value="materials:Copper"/>
421+
<Numeric name="Thickness" value="[hgcal:thickHECooling]"/>
422+
<Numeric name="zMinBlock" value="[zMinBlockHEC2]"/>
423+
<Numeric name="ModuleThick" value="[hgcal:thickHEModule2]"/>
424+
<Numeric name="Parts" value="1"/>
425+
<Numeric name="PhiStart" value="0"/>
426+
<Vector name="TagLayer" type="string" nEntries="10">
427+
L02, L03, L04, L05, L06, L07, L08, L09, L10, L11</Vector>
428+
<Vector name="TagSector" type="string" nEntries="12">
429+
F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11</Vector>
430+
<Vector name="LayerNames" type="string" nEntries="1">
431+
Copper</Vector>
432+
<Vector name="LayerMaterials" type="string" nEntries="1">
433+
materials:Copper</Vector>
434+
<Vector name="LayerThickness" type="numeric" nEntries="1">
435+
[hgcal:thickHECooling]</Vector>
436+
<Vector name="LayerType" type="numeric" nEntries="0">
437+
</Vector>
438+
<Numeric name="ShiftTop" value="[shiftTop]"/>
439+
<Numeric name="ShiftBottom" value="[shiftBottom]"/>
440+
<Vector name="SlopeBottom" type="numeric" nEntries="4">
441+
0, 0, 0, 0</Vector>
442+
<Vector name="ZFrontBottom" type="numeric" nEntries="4">
443+
[hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
444+
[hgcal:zHGCal8]</Vector>
445+
<Vector name="RMinFront" type="numeric" nEntries="4">
446+
[hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
447+
[hgcal:rMinHGCal6], [hgcal:rMinHGCal8]</Vector>
448+
<Vector name="SlopeTop" type="numeric" nEntries="4">
449+
[hgcal:slope1], [hgcal:slope3], 0, 0</Vector>
450+
<Vector name="ZFrontTop" type="numeric" nEntries="4">
451+
[hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
452+
[hgcal:zHGCal11]</Vector>
453+
<Vector name="RMaxFront" type="numeric" nEntries="4">
454+
[hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
455+
[hgcal:rMaxHGCal11]</Vector>
456+
</Algorithm>
457+
<Algorithm name="hgcal:DDHGCalPassive">
458+
<rParent name="hgcalPassive:HGCalHECoolingPlate"/>
459+
<String name="ModuleMaterial" value="materials:Copper"/>
460+
<Numeric name="Thickness" value="[hgcal:thickHECooling]"/>
461+
<Numeric name="zMinBlock" value="[zMinBlockHEC4]"/>
462+
<Numeric name="ModuleThick" value="[hgcal:thickHEModule3]"/>
463+
<Numeric name="Parts" value="1"/>
464+
<Numeric name="PhiStart" value="0"/>
465+
<Vector name="TagLayer" type="string" nEntries="10">
466+
L12, L13, L14, L15, L16, L17, L18, L19, L20, L21</Vector>
467+
<Vector name="TagSector" type="string" nEntries="12">
468+
F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11</Vector>
469+
<Vector name="LayerNames" type="string" nEntries="1">
470+
Copper</Vector>
471+
<Vector name="LayerMaterials" type="string" nEntries="1">
472+
materials:Copper</Vector>
473+
<Vector name="LayerThickness" type="numeric" nEntries="1">
474+
[hgcal:thickHECooling]</Vector>
232475
<Vector name="LayerType" type="numeric" nEntries="0">
233476
</Vector>
234477
<Numeric name="ShiftTop" value="[shiftTop]"/>

0 commit comments

Comments
 (0)