Skip to content

Commit 136efc3

Browse files
author
Sunanda
committed
Modify the V19 longitudinal structure of HGCal according to Meeting specification of 06/09/2024
1 parent d1f3825 commit 136efc3

File tree

7 files changed

+529
-548
lines changed

7 files changed

+529
-548
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<Constant name="GuardRingOffset" value="0.90*mm"/>
1313
<Constant name="MouseBite" value="5.00*mm"/>
1414
<Constant name="UseOffset" value="1"/>
15-
<Constant name="ModuleThicknessEE" value="8.37*mm"/>
16-
<Constant name="ModuleThicknessHE" value="9.18*mm"/>
15+
<Constant name="ModuleThicknessEE" value="8.485*mm"/>
16+
<Constant name="ModuleThicknessHE" value="8.135*mm"/>
1717
<Constant name="CellThicknessFine" value="0.12*mm"/>
1818
<Constant name="CellThicknessCoarse1" value="0.20*mm"/>
1919
<Constant name="CellThicknessCoarse2" value="0.30*mm"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
<Vector name="Thickness" type="numeric" nEntries="9">
270270
[hgcal:thickEEAbsorber1], [hgcal:thickEEAbsorber2], [hgcal:thickEEAbsorber3],
271271
[hgcal:thickEECooling], 1.0*mm, [hgcal:ModuleThicknessEE],
272-
[hgcal:ModuleThicknessEE], 1.490*mm, 1.465*mm</Vector>
272+
[hgcal:ModuleThicknessEE], 1.375*mm, 1.350*mm</Vector>
273273
<Vector name="Layers" type="numeric" nEntries="13">
274274
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7</Vector>
275275
<Vector name="LayerThick" type="numeric" nEntries="13">

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -373,36 +373,36 @@
373373
hgcalPassive:HGCalHECoolingPlateL21F06, hgcalPassive:HGCalHECoolingPlateL21F07,
374374
hgcalPassive:HGCalHECoolingPlateL21F08, hgcalPassive:HGCalHECoolingPlateL21F09,
375375
hgcalPassive:HGCalHECoolingPlateL21F10, hgcalPassive:HGCalHECoolingPlateL21F11</Vector>
376-
<Vector name="MaterialNames" type="string" nEntries="6">
376+
<Vector name="MaterialNames" type="string" nEntries="7">
377377
materials:StainlessSteel, materials:StainlessSteel, materials:Air,
378-
materials:Air, materials:Air, materials:Air</Vector>
379-
<Vector name="VolumeNames" type="string" nEntries="6">
378+
materials:Air, materials:Air, materials:Air, materials:Air</Vector>
379+
<Vector name="VolumeNames" type="string" nEntries="7">
380380
HGCalHEAbsorber1, HGCalHEAbsorber2, HGCalHEAirGap1, HGCalHECover,
381-
HGCalHESiliconLayer, HGCalHECoolingPlate</Vector>
382-
<Vector name="Thickness" type="numeric" nEntries="6">
381+
HGCalHESiliconLayer, HGCalHECoolingPlate, HGCalHEAirGap2</Vector>
382+
<Vector name="Thickness" type="numeric" nEntries="7">
383383
[hgcal:thickHEAbsorber2], [hgcal:thickHEAbsorber3], [hgcal:thickHEAirGap],
384-
[hgcal:thickHESteelCover], [hgcal:ModuleThicknessHE], [hgcal:thickHECooling]
385-
</Vector>
384+
[hgcal:thickHESteelCover], [hgcal:ModuleThicknessHE], [hgcal:thickHECooling],
385+
1.045*mm</Vector>
386386
<Vector name="Layers" type="numeric" nEntries="14">
387-
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5</Vector>
387+
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6</Vector>
388388
<Vector name="LayerThick" type="numeric" nEntries="14">
389389
[hgcal:thickHEModule2], [hgcal:thickHEModule2], [hgcal:thickHEModule2],
390390
[hgcal:thickHEModule2], [hgcal:thickHEModule3], [hgcal:thickHEModule3],
391391
[hgcal:thickHEModule3], [hgcal:thickHEModule3], [hgcal:thickHEModule3],
392392
[hgcal:thickHEModule3], [hgcal:thickHEModule3], [hgcal:thickHEModule3],
393393
[hgcal:thickHEModule3], [hgcal:thickHEModule3]</Vector>
394-
<Vector name="LayerType" type="numeric" nEntries="70">
395-
0, 2, 3, 4, 5, 0, 2, 3, 4, 5, 0, 2, 3, 4, 5,
396-
0, 2, 3, 4, 5, 1, 2, 3, 4, 5, 1, 2, 3, 4, 5,
397-
1, 2, 3, 4, 5, 1, 2, 3, 4, 5, 1, 2, 3, 4, 5,
398-
1, 2, 3, 4, 5, 1, 2, 3, 4, 5, 1, 2, 3, 4, 5,
399-
1, 2, 3, 4, 5, 1, 2, 3, 4, 5</Vector>
400-
<Vector name="LayerSense" type="numeric" nEntries="70">
401-
0, 0, -1, 1, -2, 0, 0, -1, 1, -2, 0, 0, -1, 1, -2,
402-
0, 0, -1, 1, -2, 0, 0, -1, 1, -2, 0, 0, -1, 1, -2,
403-
0, 0, -1, 1, -2, 0, 0, -1, 1, -2, 0, 0, -1, 1, -2,
404-
0, 0, -1, 1, -2, 0, 0, -1, 1, -2, 0, 0, -1, 1, -2,
405-
0, 0, -1, 1, -2, 0, 0, -1, 1, -2</Vector>
394+
<Vector name="LayerType" type="numeric" nEntries="84">
395+
0, 2, 3, 6, 4, 5, 0, 2, 3, 6, 4, 5, 0, 2, 3, 6, 4, 5,
396+
0, 2, 3, 6, 4, 5, 1, 2, 3, 6, 4, 5, 1, 2, 3, 6, 4, 5,
397+
1, 2, 3, 6, 4, 5, 1, 2, 3, 6, 4, 5, 1, 2, 3, 6, 4, 5,
398+
1, 2, 3, 6, 4, 5, 1, 2, 3, 6, 4, 5, 1, 2, 3, 6, 4, 5,
399+
1, 2, 3, 6, 4, 5, 1, 2, 3, 6, 4, 5</Vector>
400+
<Vector name="LayerSense" type="numeric" nEntries="84">
401+
0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2,
402+
0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2,
403+
0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2,
404+
0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2,
405+
0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2</Vector>
406406
<Vector name="TopMaterialNames" type="string" nEntries="8">
407407
materials:Air, hgcalMaterial:HGC_TileServices, hgcalMaterial:HGC_G10-FR4,
408408
materials:Polystyrene, materials:H_Scintillator, materials:Polystyrene,
@@ -413,10 +413,10 @@
413413
HGCalHEScintillatorSensitive, HGCalScintillatorBackReflector,
414414
HGCalTileBoard, HGCalHEScintSteelCover</Vector>
415415
<Vector name="TopLayerThickness" type="numeric" nEntries="8">
416-
1.16*mm, 2.72*mm, 0.20*mm, 0.25*mm, [hgcal:ScintillatorThickness],
416+
1.045*mm, 2.835*mm, 0.20*mm, 0.25*mm, [hgcal:ScintillatorThickness],
417417
0.25*mm, 1.60*mm, 2.50*mm</Vector> <!-- scintillator module -->
418-
<Vector name="TopLayerType" type="numeric" nEntries="7">
419-
0, 1, 2, 3, 4, 5, 6</Vector>
418+
<Vector name="TopLayerType" type="numeric" nEntries="6">
419+
1, 2, 3, 4, 5, 6</Vector>
420420
<Numeric name="TopCoverLayerType" value="7"/>
421421
<Numeric name="TopCoverLayers" value="2"/>
422422
<Vector name="LayerTypes" type="numeric" nEntries="14">

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

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -354,38 +354,40 @@
354354
hgcalPassive:HGCalHECoolingPlateL21F06, hgcalPassive:HGCalHECoolingPlateL21F07,
355355
hgcalPassive:HGCalHECoolingPlateL21F08, hgcalPassive:HGCalHECoolingPlateL21F09,
356356
hgcalPassive:HGCalHECoolingPlateL21F10, hgcalPassive:HGCalHECoolingPlateL21F11</Vector>
357-
<Vector name="MaterialNames" type="string" nEntries="7">
357+
<Vector name="MaterialNames" type="string" nEntries="8">
358358
materials:StainlessSteel, materials:StainlessSteel, materials:Air,
359-
materials:Air, materials:Air, materials:Air, materials:Air</Vector>
360-
<Vector name="VolumeNames" type="string" nEntries="7">
359+
materials:Air, materials:Air, materials:Air, materials:Air,
360+
materials:Air</Vector>
361+
<Vector name="VolumeNames" type="string" nEntries="8">
361362
HGCalHEAbsorber1, HGCalHEAbsorber2, HGCalHEAirGap0, HGCalHEAirGap1,
362-
HGCalHESteelCover, HGCalHECoolingPlate, HGCalHESiliconLayer</Vector>
363-
<Vector name="Thickness" type="numeric" nEntries="7">
363+
HGCalHESteelCover, HGCalHECoolingPlate, HGCalHESiliconLayer,
364+
HGCalHEAirGap2</Vector>
365+
<Vector name="Thickness" type="numeric" nEntries="8">
364366
[hgcal:thickHEAbsorber1], [hgcal:thickHEAbsorber2], [hgcal:thickHEAirGap],
365367
[hgcal:thickHEService], [hgcal:thickHESteelCover], [hgcal:thickHECooling],
366-
[hgcal:ModuleThicknessHE] </Vector>
368+
[hgcal:ModuleThicknessHE], 1.045*mm </Vector>
367369
<Vector name="Layers" type="numeric" nEntries="7">
368-
5, 5, 5, 5, 5, 5, 5</Vector>
370+
6, 6, 6, 6, 6, 6, 6</Vector>
369371
<Vector name="LayerThick" type="numeric" nEntries="7">
370372
[hgcal:thickHEModule1], [hgcal:thickHEModule2], [hgcal:thickHEModule2],
371373
[hgcal:thickHEModule2], [hgcal:thickHEModule2], [hgcal:thickHEModule2],
372374
[hgcal:thickHEModule2]</Vector>
373-
<Vector name="LayerType" type="numeric" nEntries="35">
374-
0, 2, 4, 6, 5,
375-
1, 2, 4, 6, 5,
376-
1, 2, 4, 6, 5,
377-
1, 2, 4, 6, 5,
378-
1, 2, 4, 6, 5,
379-
1, 2, 4, 6, 5,
380-
1, 2, 4, 6, 5 </Vector>
381-
<Vector name="LayerSense" type="numeric" nEntries="35">
382-
0, 0, -1, 1, -2,
383-
0, 0, -1, 1, -2,
384-
0, 0, -1, 1, -2,
385-
0, 0, -1, 1, -2,
386-
0, 0, -1, 1, -2,
387-
0, 0, -1, 1, -2,
388-
0, 0, -1, 1, -2</Vector>
375+
<Vector name="LayerType" type="numeric" nEntries="42">
376+
0, 2, 4, 7, 6, 5,
377+
1, 2, 4, 7, 6, 5,
378+
1, 2, 4, 7, 6, 5,
379+
1, 2, 4, 7, 6, 5,
380+
1, 2, 4, 7, 6, 5,
381+
1, 2, 4, 7, 6, 5,
382+
1, 2, 4, 7, 6, 5 </Vector>
383+
<Vector name="LayerSense" type="numeric" nEntries="42">
384+
0, 0, -1, 0, 1, -2,
385+
0, 0, -1, 0, 1, -2,
386+
0, 0, -1, 0, 1, -2,
387+
0, 0, -1, 0, 1, -2,
388+
0, 0, -1, 0, 1, -2,
389+
0, 0, -1, 0, 1, -2,
390+
0, 0, -1, 0, 1, -2</Vector>
389391
<Vector name="SlopeBottom" type="numeric" nEntries="4">
390392
0, 0, 0, 0</Vector>
391393
<Vector name="ZFrontBottom" type="numeric" nEntries="4">

‎Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml‎

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,42 @@
9494
<rMaterial name="materials:Air"/>
9595
</MaterialFraction>
9696
</CompositeMaterial>
97-
<CompositeMaterial name="HGC_Kapton" density="1.11*g/cm3" symbol=" " method="mixture by weight">
98-
<MaterialFraction fraction="1.0">
99-
<rMaterial name="materials:Kapton"/>
97+
<CompositeMaterial name="HGC_Kapton_PDG" density="1.42*g/cm3" symbol=" " method="mixture by weight">
98+
<MaterialFraction fraction="0.0264">
99+
<rMaterial name="materials:Hydrogen"/>
100+
</MaterialFraction>
101+
<MaterialFraction fraction="0.0733">
102+
<rMaterial name="materials:Nitrogen"/>
103+
</MaterialFraction>
104+
<MaterialFraction fraction="0.2092">
105+
<rMaterial name="materials:Oxygen"/>
106+
</MaterialFraction>
107+
<MaterialFraction fraction="0.6911">
108+
<rMaterial name="materials:Carbon"/>
109+
</MaterialFraction>
110+
</CompositeMaterial>
111+
<CompositeMaterial name="HGC_Kapton" density="1.681*g/cm3" symbol=" " method="mixture by weight">
112+
<MaterialFraction fraction="0.422">
113+
<rMaterial name="hgcalMaterial:HGC_Kapton_PDG"/>
114+
</MaterialFraction>
115+
<MaterialFraction fraction="0.320">
116+
<rMaterial name="materials:Copper"/>
117+
</MaterialFraction>
118+
<MaterialFraction fraction="0.258">
119+
<rMaterial name="materials:Epoxy"/>
100120
</MaterialFraction>
101121
</CompositeMaterial>
102122
<CompositeMaterial name="HGC_Epoxy" density="1.30*g/cm3" symbol=" " method="mixture by weight">
103123
<MaterialFraction fraction="1.0">
104124
<rMaterial name="materials:Epoxy"/>
105125
</MaterialFraction>
106126
</CompositeMaterial>
107-
<CompositeMaterial name="HGC_Hexaboard" density="1.70*g/cm3" symbol=" " method="mixture by weight">
108-
<MaterialFraction fraction="1.0">
109-
<rMaterial name="hgcalMaterial:HGC_G10-FR4"/>
127+
<CompositeMaterial name="HGC_Hexaboard" density="2.432*g/cm3" symbol=" " method="mixture by weight">
128+
<MaterialFraction fraction="0.581">
129+
<rMaterial name="materials:M_NEMA FR4 plate"/>
130+
</MaterialFraction>
131+
<MaterialFraction fraction="0.419">
132+
<rMaterial name="materials:Copper"/>
110133
</MaterialFraction>
111134
</CompositeMaterial>
112135
<CompositeMaterial name="HGC_HEBasePlate" density="1.70*g/cm3" symbol=" " method="mixture by weight">

0 commit comments

Comments
 (0)