Skip to content

Commit

Permalink
Merge pull request #45951 from bsunanda/Phase2-hgx360A
Browse files Browse the repository at this point in the history 
Phase2-hgx360A Modify the V19 longitudinal structure of HGCal according to Meeting specification of 06/09/2024
  • Loading branch information
@cmsbuild
cmsbuild authored Sep 10, 2024
2 parents a377ccd + 136efc3 commit 21de629
Show file tree
Hide file tree
Showing 7 changed files with 529 additions and 548 deletions.
4 changes: 2 additions & 2 deletions Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<Constant name="GuardRingOffset" value="0.90*mm"/>
<Constant name="MouseBite" value="5.00*mm"/>
<Constant name="UseOffset" value="1"/>
<Constant name="ModuleThicknessEE" value="8.37*mm"/>
<Constant name="ModuleThicknessHE" value="9.18*mm"/>
<Constant name="ModuleThicknessEE" value="8.485*mm"/>
<Constant name="ModuleThicknessHE" value="8.135*mm"/>
<Constant name="CellThicknessFine" value="0.12*mm"/>
<Constant name="CellThicknessCoarse1" value="0.20*mm"/>
<Constant name="CellThicknessCoarse2" value="0.30*mm"/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
<Vector name="Thickness" type="numeric" nEntries="9">
[hgcal:thickEEAbsorber1], [hgcal:thickEEAbsorber2], [hgcal:thickEEAbsorber3],
[hgcal:thickEECooling], 1.0*mm, [hgcal:ModuleThicknessEE],
[hgcal:ModuleThicknessEE], 1.490*mm, 1.465*mm</Vector>
[hgcal:ModuleThicknessEE], 1.375*mm, 1.350*mm</Vector>
<Vector name="Layers" type="numeric" nEntries="13">
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7</Vector>
<Vector name="LayerThick" type="numeric" nEntries="13">
Expand Down
46 changes: 23 additions & 23 deletions Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,36 +373,36 @@
hgcalPassive:HGCalHECoolingPlateL21F06, hgcalPassive:HGCalHECoolingPlateL21F07,
hgcalPassive:HGCalHECoolingPlateL21F08, hgcalPassive:HGCalHECoolingPlateL21F09,
hgcalPassive:HGCalHECoolingPlateL21F10, hgcalPassive:HGCalHECoolingPlateL21F11</Vector>
<Vector name="MaterialNames" type="string" nEntries="6">
<Vector name="MaterialNames" type="string" nEntries="7">
materials:StainlessSteel, materials:StainlessSteel, materials:Air,
materials:Air, materials:Air, materials:Air</Vector>
<Vector name="VolumeNames" type="string" nEntries="6">
materials:Air, materials:Air, materials:Air, materials:Air</Vector>
<Vector name="VolumeNames" type="string" nEntries="7">
HGCalHEAbsorber1, HGCalHEAbsorber2, HGCalHEAirGap1, HGCalHECover,
HGCalHESiliconLayer, HGCalHECoolingPlate</Vector>
<Vector name="Thickness" type="numeric" nEntries="6">
HGCalHESiliconLayer, HGCalHECoolingPlate, HGCalHEAirGap2</Vector>
<Vector name="Thickness" type="numeric" nEntries="7">
[hgcal:thickHEAbsorber2], [hgcal:thickHEAbsorber3], [hgcal:thickHEAirGap],
[hgcal:thickHESteelCover], [hgcal:ModuleThicknessHE], [hgcal:thickHECooling]
</Vector>
[hgcal:thickHESteelCover], [hgcal:ModuleThicknessHE], [hgcal:thickHECooling],
1.045*mm</Vector>
<Vector name="Layers" type="numeric" nEntries="14">
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5</Vector>
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6</Vector>
<Vector name="LayerThick" type="numeric" nEntries="14">
[hgcal:thickHEModule2], [hgcal:thickHEModule2], [hgcal:thickHEModule2],
[hgcal:thickHEModule2], [hgcal:thickHEModule3], [hgcal:thickHEModule3],
[hgcal:thickHEModule3], [hgcal:thickHEModule3], [hgcal:thickHEModule3],
[hgcal:thickHEModule3], [hgcal:thickHEModule3], [hgcal:thickHEModule3],
[hgcal:thickHEModule3], [hgcal:thickHEModule3]</Vector>
<Vector name="LayerType" type="numeric" nEntries="70">
0, 2, 3, 4, 5, 0, 2, 3, 4, 5, 0, 2, 3, 4, 5,
0, 2, 3, 4, 5, 1, 2, 3, 4, 5, 1, 2, 3, 4, 5,
1, 2, 3, 4, 5, 1, 2, 3, 4, 5, 1, 2, 3, 4, 5,
1, 2, 3, 4, 5, 1, 2, 3, 4, 5, 1, 2, 3, 4, 5,
1, 2, 3, 4, 5, 1, 2, 3, 4, 5</Vector>
<Vector name="LayerSense" type="numeric" nEntries="70">
0, 0, -1, 1, -2, 0, 0, -1, 1, -2, 0, 0, -1, 1, -2,
0, 0, -1, 1, -2, 0, 0, -1, 1, -2, 0, 0, -1, 1, -2,
0, 0, -1, 1, -2, 0, 0, -1, 1, -2, 0, 0, -1, 1, -2,
0, 0, -1, 1, -2, 0, 0, -1, 1, -2, 0, 0, -1, 1, -2,
0, 0, -1, 1, -2, 0, 0, -1, 1, -2</Vector>
<Vector name="LayerType" type="numeric" nEntries="84">
0, 2, 3, 6, 4, 5, 0, 2, 3, 6, 4, 5, 0, 2, 3, 6, 4, 5,
0, 2, 3, 6, 4, 5, 1, 2, 3, 6, 4, 5, 1, 2, 3, 6, 4, 5,
1, 2, 3, 6, 4, 5, 1, 2, 3, 6, 4, 5, 1, 2, 3, 6, 4, 5,
1, 2, 3, 6, 4, 5, 1, 2, 3, 6, 4, 5, 1, 2, 3, 6, 4, 5,
1, 2, 3, 6, 4, 5, 1, 2, 3, 6, 4, 5</Vector>
<Vector name="LayerSense" type="numeric" nEntries="84">
0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2,
0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2,
0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2,
0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2,
0, 0, -1, 0, 1, -2, 0, 0, -1, 0, 1, -2</Vector>
<Vector name="TopMaterialNames" type="string" nEntries="8">
materials:Air, hgcalMaterial:HGC_TileServices, hgcalMaterial:HGC_G10-FR4,
materials:Polystyrene, materials:H_Scintillator, materials:Polystyrene,
Expand All @@ -413,10 +413,10 @@
HGCalHEScintillatorSensitive, HGCalScintillatorBackReflector,
HGCalTileBoard, HGCalHEScintSteelCover</Vector>
<Vector name="TopLayerThickness" type="numeric" nEntries="8">
1.16*mm, 2.72*mm, 0.20*mm, 0.25*mm, [hgcal:ScintillatorThickness],
1.045*mm, 2.835*mm, 0.20*mm, 0.25*mm, [hgcal:ScintillatorThickness],
0.25*mm, 1.60*mm, 2.50*mm</Vector> <!-- scintillator module -->
<Vector name="TopLayerType" type="numeric" nEntries="7">
0, 1, 2, 3, 4, 5, 6</Vector>
<Vector name="TopLayerType" type="numeric" nEntries="6">
1, 2, 3, 4, 5, 6</Vector>
<Numeric name="TopCoverLayerType" value="7"/>
<Numeric name="TopCoverLayers" value="2"/>
<Vector name="LayerTypes" type="numeric" nEntries="14">
Expand Down
48 changes: 25 additions & 23 deletions Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,38 +354,40 @@
hgcalPassive:HGCalHECoolingPlateL21F06, hgcalPassive:HGCalHECoolingPlateL21F07,
hgcalPassive:HGCalHECoolingPlateL21F08, hgcalPassive:HGCalHECoolingPlateL21F09,
hgcalPassive:HGCalHECoolingPlateL21F10, hgcalPassive:HGCalHECoolingPlateL21F11</Vector>
<Vector name="MaterialNames" type="string" nEntries="7">
<Vector name="MaterialNames" type="string" nEntries="8">
materials:StainlessSteel, materials:StainlessSteel, materials:Air,
materials:Air, materials:Air, materials:Air, materials:Air</Vector>
<Vector name="VolumeNames" type="string" nEntries="7">
materials:Air, materials:Air, materials:Air, materials:Air,
materials:Air</Vector>
<Vector name="VolumeNames" type="string" nEntries="8">
HGCalHEAbsorber1, HGCalHEAbsorber2, HGCalHEAirGap0, HGCalHEAirGap1,
HGCalHESteelCover, HGCalHECoolingPlate, HGCalHESiliconLayer</Vector>
<Vector name="Thickness" type="numeric" nEntries="7">
HGCalHESteelCover, HGCalHECoolingPlate, HGCalHESiliconLayer,
HGCalHEAirGap2</Vector>
<Vector name="Thickness" type="numeric" nEntries="8">
[hgcal:thickHEAbsorber1], [hgcal:thickHEAbsorber2], [hgcal:thickHEAirGap],
[hgcal:thickHEService], [hgcal:thickHESteelCover], [hgcal:thickHECooling],
[hgcal:ModuleThicknessHE] </Vector>
[hgcal:ModuleThicknessHE], 1.045*mm </Vector>
<Vector name="Layers" type="numeric" nEntries="7">
5, 5, 5, 5, 5, 5, 5</Vector>
6, 6, 6, 6, 6, 6, 6</Vector>
<Vector name="LayerThick" type="numeric" nEntries="7">
[hgcal:thickHEModule1], [hgcal:thickHEModule2], [hgcal:thickHEModule2],
[hgcal:thickHEModule2], [hgcal:thickHEModule2], [hgcal:thickHEModule2],
[hgcal:thickHEModule2]</Vector>
<Vector name="LayerType" type="numeric" nEntries="35">
0, 2, 4, 6, 5,
1, 2, 4, 6, 5,
1, 2, 4, 6, 5,
1, 2, 4, 6, 5,
1, 2, 4, 6, 5,
1, 2, 4, 6, 5,
1, 2, 4, 6, 5 </Vector>
<Vector name="LayerSense" type="numeric" nEntries="35">
0, 0, -1, 1, -2,
0, 0, -1, 1, -2,
0, 0, -1, 1, -2,
0, 0, -1, 1, -2,
0, 0, -1, 1, -2,
0, 0, -1, 1, -2,
0, 0, -1, 1, -2</Vector>
<Vector name="LayerType" type="numeric" nEntries="42">
0, 2, 4, 7, 6, 5,
1, 2, 4, 7, 6, 5,
1, 2, 4, 7, 6, 5,
1, 2, 4, 7, 6, 5,
1, 2, 4, 7, 6, 5,
1, 2, 4, 7, 6, 5,
1, 2, 4, 7, 6, 5 </Vector>
<Vector name="LayerSense" type="numeric" nEntries="42">
0, 0, -1, 0, 1, -2,
0, 0, -1, 0, 1, -2,
0, 0, -1, 0, 1, -2,
0, 0, -1, 0, 1, -2,
0, 0, -1, 0, 1, -2,
0, 0, -1, 0, 1, -2,
0, 0, -1, 0, 1, -2</Vector>
<Vector name="SlopeBottom" type="numeric" nEntries="4">
0, 0, 0, 0</Vector>
<Vector name="ZFrontBottom" type="numeric" nEntries="4">
Expand Down
35 changes: 29 additions & 6 deletions Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,19 +94,42 @@
<rMaterial name="materials:Air"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="HGC_Kapton" density="1.11*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="1.0">
<rMaterial name="materials:Kapton"/>
<CompositeMaterial name="HGC_Kapton_PDG" density="1.42*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.0264">
<rMaterial name="materials:Hydrogen"/>
</MaterialFraction>
<MaterialFraction fraction="0.0733">
<rMaterial name="materials:Nitrogen"/>
</MaterialFraction>
<MaterialFraction fraction="0.2092">
<rMaterial name="materials:Oxygen"/>
</MaterialFraction>
<MaterialFraction fraction="0.6911">
<rMaterial name="materials:Carbon"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="HGC_Kapton" density="1.681*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.422">
<rMaterial name="hgcalMaterial:HGC_Kapton_PDG"/>
</MaterialFraction>
<MaterialFraction fraction="0.320">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.258">
<rMaterial name="materials:Epoxy"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="HGC_Epoxy" density="1.30*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="1.0">
<rMaterial name="materials:Epoxy"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="HGC_Hexaboard" density="1.70*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="1.0">
<rMaterial name="hgcalMaterial:HGC_G10-FR4"/>
<CompositeMaterial name="HGC_Hexaboard" density="2.432*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.581">
<rMaterial name="materials:M_NEMA FR4 plate"/>
</MaterialFraction>
<MaterialFraction fraction="0.419">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="HGC_HEBasePlate" density="1.70*g/cm3" symbol=" " method="mixture by weight">
Expand Down
Loading

0 comments on commit 21de629

Please sign in to comment.