Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Phase2-hgx359J Add new code for V19 version of HGCal geometry #45668

Merged
merged 3 commits into from
Aug 9, 2024
Merged

Phase2-hgx359J Add new code for V19 version of HGCal geometry #45668

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04a6917
Add new code for V19 version of HGCal geometry
Aug 8, 2024
d52b3c6
Code check
Aug 8, 2024
391407c
As suggested
Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,29 @@
<Constant name="thickEEModule1" value="28.37*mm"/>
<Constant name="thickEEModule2" value="30.57*mm"/>
<Constant name="thickEEModule3" value="33.82*mm"/>
<Constant name="thickEEModule4" value="34.82*mm"/>
<Constant name="thickEEAbsorber1" value="3.67*mm"/>
<Constant name="thickEEAbsorber2" value="5.87*mm"/>
<Constant name="thickEEAbsorber3" value="9.12*mm"/>
<Constant name="thickEECooling" value="6.05*mm"/>
<Constant name="nEEModule1" value="1"/>
<Constant name="nEEModule2" value="8"/>
<Constant name="nEEModule3" value="4"/>
<Constant name="thickHEModule1" value="67.80*mm"/>
<Constant name="thickHEModule2" value="63.05*mm"/>
<Constant name="thickHEModule3" value="82.25*mm"/>
<Constant name="thickHEAbsorber1" value="45.0*mm"/>
<Constant name="thickHEAbsorber2" value="41.5*mm"/>
<Constant name="thickHEAbsorber3" value="60.7*mm"/>
<Constant name="thickHEAirGap" value="1.25*mm"/>
<Constant name="thickHESteelCover" value="2.5*mm"/>
<Constant name="thickHEService" value="4.0*mm"/>
<Constant name="thickHEShift1" value="([thickHEAbsorber1] + [thickHEService] + [thickHEAirGap])"/>
<Constant name="thickHEShift2" value="([thickHEAbsorber2] + [thickHEService])"/>
<Constant name="thickHEShift3" value="([thickHEAbsorber3] + [thickHEService])"/>
<Constant name="thickHECooling" value="6.35*mm"/>
<Constant name="nHEModule1" value="1"/>
<Constant name="nHEModule2" value="4"/>
</ConstantsSection>

<RotationSection label="hgcal.xml">
Expand Down
1 change: 1 addition & 0 deletions Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<Numeric name="FirstLayer" value="1"/>
<Numeric name="AbsorberMode" value="0"/>
<Numeric name="SensitiveMode" value="0"/>
<Numeric name="PassiveMode" value="0"/>
<Numeric name="zMinBlock" value="[hgcal:zHGCalEE1]"/>
<Numeric name="waferSize" value="[hgcal:WaferSize]"/>
<Numeric name="SensorSeparation" value="[hgcal:SensorSeparation]"/>
Expand Down
318 changes: 100 additions & 218 deletions Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml
View file
Open in desktop

Large diffs are not rendered by default.

316 changes: 269 additions & 47 deletions Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<Numeric name="FirstLayer" value="1"/>
<Numeric name="AbsorberMode" value="1"/>
<Numeric name="SensitiveMode" value="1"/>
<Numeric name="PassiveMode" value="0"/>
<Numeric name="zMinBlock" value="[hgcal:zHGCalHEsil1]"/>
<Numeric name="waferSize" value="[hgcal:WaferSize]"/>
<Numeric name="SensorSeparation" value="[hgcal:SensorSeparation]"/>
Expand Down
315 changes: 268 additions & 47 deletions Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml
View file
Open in desktop

Large diffs are not rendered by default.

249 changes: 246 additions & 3 deletions Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@
<Constant name="zMinBlockEEC1" value="([zMinBlockEE1] + [hgcal:thickEEModule1] - [hgcal:thickEECooling])"/>
<Constant name="zMinBlockEEC2" value="([zMinBlockEE2] + [hgcal:thickEEModule2] - [hgcal:thickEECooling])"/>
<Constant name="zMinBlockEEC3" value="([zMinBlockEE3] + [hgcal:thickEEModule3] - [hgcal:thickEECooling])"/>
<Constant name="zMinBlockHE1" value="([hgcal:zHGCalHEsil1] + [hgcal:thickHEShift1])"/>
<Constant name="zMinBlockHEC1" value="([zMinBlockHE1] + [hgcal:ModuleThicknessHE] + [hgcal:thickHESteelCover])"/>
<Constant name="zMinBlockHE2" value="([zMinBlockHEC1] + [hgcal:ModuleThicknessHE] + [hgcal:thickHEShift2])"/>
<Constant name="zMinBlockHEC2" value="([zMinBlockHE2] + [hgcal:ModuleThicknessHE] + [hgcal:thickHESteelCover])"/>
<Constant name="zMinBlockHE3" value="([hgcal:zHGCalHEmix1] + [hgcal:thickHEShift2])"/>
<Constant name="zMinBlockHEC3" value="([zMinBlockHE3] + [hgcal:ModuleThicknessHE] + [hgcal:thickHESteelCover])"/>
<Constant name="zMinBlockHE4" value="([zMinBlockHEC3] + [hgcal:ModuleThicknessHE] + [hgcal:thickHESteelCover] +
[hgcal:thickHEModule2] * ([hgcal:nHEModule2] - 1) + [hgcal:thickHEShift3])"/>
<Constant name="zMinBlockHEC4" value="([zMinBlockHE4] + [hgcal:ModuleThicknessHE] + [hgcal:thickHESteelCover])"/>
</ConstantsSection>

<PosPartSection label="hgcalPassive.xml" eval="true">
Expand Down Expand Up @@ -150,7 +159,7 @@
<Vector name="LayerMaterials" type="string" nEntries="1">
materials:Copper</Vector>
<Vector name="LayerThickness" type="numeric" nEntries="1">
6.05*mm</Vector>
[hgcal:thickEECooling]</Vector>
<Vector name="LayerType" type="numeric" nEntries="0">
</Vector>
<Numeric name="ShiftTop" value="[shiftTop]"/>
Expand Down Expand Up @@ -189,7 +198,7 @@
<Vector name="LayerMaterials" type="string" nEntries="1">
materials:Copper</Vector>
<Vector name="LayerThickness" type="numeric" nEntries="1">
6.05*mm</Vector>
[hgcal:thickEECooling]</Vector>
<Vector name="LayerType" type="numeric" nEntries="0">
</Vector>
<Numeric name="ShiftTop" value="[shiftTop]"/>
Expand Down Expand Up @@ -228,7 +237,241 @@
<Vector name="LayerMaterials" type="string" nEntries="1">
materials:Copper</Vector>
<Vector name="LayerThickness" type="numeric" nEntries="1">
6.05*mm</Vector>
[hgcal:thickEECooling]</Vector>
<Vector name="LayerType" type="numeric" nEntries="0">
</Vector>
<Numeric name="ShiftTop" value="[shiftTop]"/>
<Numeric name="ShiftBottom" value="[shiftBottom]"/>
<Vector name="SlopeBottom" type="numeric" nEntries="4">
0, 0, 0, 0</Vector>
<Vector name="ZFrontBottom" type="numeric" nEntries="4">
[hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
[hgcal:zHGCal8]</Vector>
<Vector name="RMinFront" type="numeric" nEntries="4">
[hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
[hgcal:rMinHGCal6], [hgcal:rMinHGCal8]</Vector>
<Vector name="SlopeTop" type="numeric" nEntries="4">
[hgcal:slope1], [hgcal:slope3], 0, 0</Vector>
<Vector name="ZFrontTop" type="numeric" nEntries="4">
[hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
[hgcal:zHGCal11]</Vector>
<Vector name="RMaxFront" type="numeric" nEntries="4">
[hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
[hgcal:rMaxHGCal11]</Vector>
</Algorithm>
<Algorithm name="hgcal:DDHGCalPassive">
<rParent name="hgcalPassive:HGCalHEPassive"/>
<String name="ModuleMaterial" value="materials:Air"/>
<Numeric name="Thickness" value="[hgcal:thickHEAbsorber1]"/>
<Numeric name="zMinBlock" value="[zMinBlockHE1]"/>
<Numeric name="ModuleThick" value="[hgcal:thickHEModule1]"/>
<Numeric name="Parts" value="1"/>
<Numeric name="PhiStart" value="0"/>
<Vector name="TagLayer" type="string" nEntries="1">
L01</Vector>
<Vector name="TagSector" type="string" nEntries="12">
F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11</Vector>
<Vector name="LayerNames" type="string" nEntries="1">
StainlessSteel</Vector>
<Vector name="LayerMaterials" type="string" nEntries="1">
materials:StainlessSteel</Vector>
<Vector name="LayerThickness" type="numeric" nEntries="1">
[hgcal:thickHEAbsorber1]</Vector>
<Vector name="LayerType" type="numeric" nEntries="1">
0</Vector>
<Numeric name="ShiftTop" value="[shiftTop]"/>
<Numeric name="ShiftBottom" value="[shiftBottom]"/>
<Vector name="SlopeBottom" type="numeric" nEntries="4">
0, 0, 0, 0</Vector>
<Vector name="ZFrontBottom" type="numeric" nEntries="4">
[hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
[hgcal:zHGCal8]</Vector>
<Vector name="RMinFront" type="numeric" nEntries="4">
[hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
[hgcal:rMinHGCal6], [hgcal:rMinHGCal8]</Vector>
<Vector name="SlopeTop" type="numeric" nEntries="4">
[hgcal:slope1], [hgcal:slope3], 0, 0</Vector>
<Vector name="ZFrontTop" type="numeric" nEntries="4">
[hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
[hgcal:zHGCal11]</Vector>
<Vector name="RMaxFront" type="numeric" nEntries="4">
[hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
[hgcal:rMaxHGCal11]</Vector>
</Algorithm>
<Algorithm name="hgcal:DDHGCalPassive">
<rParent name="hgcalPassive:HGCalHEPassive"/>
<String name="ModuleMaterial" value="materials:Air"/>
<Numeric name="Thickness" value="[hgcal:thickHEAbsorber2]"/>
<Numeric name="zMinBlock" value="[zMinBlockHE2]"/>
<Numeric name="ModuleThick" value="[hgcal:thickHEModule2]"/>
<Numeric name="Parts" value="1"/>
<Numeric name="PhiStart" value="0"/>
<Vector name="TagLayer" type="string" nEntries="10">
L02, L03, L04, L05, L06, L07, L08, L09, L10, L11</Vector>
<Vector name="TagSector" type="string" nEntries="12">
F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11</Vector>
<Vector name="LayerNames" type="string" nEntries="1">
StainlessSteel</Vector>
<Vector name="LayerMaterials" type="string" nEntries="1">
materials:StainlessSteel</Vector>
<Vector name="LayerThickness" type="numeric" nEntries="1">
[hgcal:thickHEAbsorber2]</Vector>
<Vector name="LayerType" type="numeric" nEntries="1">
0</Vector>
<Numeric name="ShiftTop" value="[shiftTop]"/>
<Numeric name="ShiftBottom" value="[shiftBottom]"/>
<Vector name="SlopeBottom" type="numeric" nEntries="4">
0, 0, 0, 0</Vector>
<Vector name="ZFrontBottom" type="numeric" nEntries="4">
[hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
[hgcal:zHGCal8]</Vector>
<Vector name="RMinFront" type="numeric" nEntries="4">
[hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
[hgcal:rMinHGCal6], [hgcal:rMinHGCal8]</Vector>
<Vector name="SlopeTop" type="numeric" nEntries="4">
[hgcal:slope1], [hgcal:slope3], 0, 0</Vector>
<Vector name="ZFrontTop" type="numeric" nEntries="4">
[hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
[hgcal:zHGCal11]</Vector>
<Vector name="RMaxFront" type="numeric" nEntries="4">
[hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
[hgcal:rMaxHGCal11]</Vector>
</Algorithm>
<Algorithm name="hgcal:DDHGCalPassive">
<rParent name="hgcalPassive:HGCalHEPassive"/>
<String name="ModuleMaterial" value="materials:Air"/>
<Numeric name="Thickness" value="[hgcal:thickHEAbsorber3]"/>
<Numeric name="zMinBlock" value="[zMinBlockHE4]"/>
<Numeric name="ModuleThick" value="[hgcal:thickHEModule3]"/>
<Numeric name="Parts" value="1"/>
<Numeric name="PhiStart" value="0"/>
<Vector name="TagLayer" type="string" nEntries="10">
L12, L13, L14, L15, L16, L17, L18, L19, L20, L21</Vector>
<Vector name="TagSector" type="string" nEntries="12">
F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11</Vector>
<Vector name="LayerNames" type="string" nEntries="1">
StainlessSteel</Vector>
<Vector name="LayerMaterials" type="string" nEntries="1">
materials:StainlessSteel</Vector>
<Vector name="LayerThickness" type="numeric" nEntries="1">
[hgcal:thickHEAbsorber3]</Vector>
<Vector name="LayerType" type="numeric" nEntries="1">
0</Vector>
<Numeric name="ShiftTop" value="[shiftTop]"/>
<Numeric name="ShiftBottom" value="[shiftBottom]"/>
<Vector name="SlopeBottom" type="numeric" nEntries="4">
0, 0, 0, 0</Vector>
<Vector name="ZFrontBottom" type="numeric" nEntries="4">
[hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
[hgcal:zHGCal8]</Vector>
<Vector name="RMinFront" type="numeric" nEntries="4">
[hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
[hgcal:rMinHGCal6], [hgcal:rMinHGCal8]</Vector>
<Vector name="SlopeTop" type="numeric" nEntries="4">
[hgcal:slope1], [hgcal:slope3], 0, 0</Vector>
<Vector name="ZFrontTop" type="numeric" nEntries="4">
[hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
[hgcal:zHGCal11]</Vector>
<Vector name="RMaxFront" type="numeric" nEntries="4">
[hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
[hgcal:rMaxHGCal11]</Vector>
</Algorithm>
<Algorithm name="hgcal:DDHGCalPassive">
<rParent name="hgcalPassive:HGCalHECoolingPlate"/>
<String name="ModuleMaterial" value="materials:Copper"/>
<Numeric name="Thickness" value="[hgcal:thickHECooling]"/>
<Numeric name="zMinBlock" value="[zMinBlockHEC1]"/>
<Numeric name="ModuleThick" value="[hgcal:thickHEModule1]"/>
<Numeric name="Parts" value="1"/>
<Numeric name="PhiStart" value="0"/>
<Vector name="TagLayer" type="string" nEntries="1">
L01</Vector>
<Vector name="TagSector" type="string" nEntries="12">
F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11</Vector>
<Vector name="LayerNames" type="string" nEntries="1">
Copper</Vector>
<Vector name="LayerMaterials" type="string" nEntries="1">
materials:Copper</Vector>
<Vector name="LayerThickness" type="numeric" nEntries="1">
[hgcal:thickHECooling]</Vector>
<Vector name="LayerType" type="numeric" nEntries="0">
</Vector>
<Numeric name="ShiftTop" value="[shiftTop]"/>
<Numeric name="ShiftBottom" value="[shiftBottom]"/>
<Vector name="SlopeBottom" type="numeric" nEntries="4">
0, 0, 0, 0</Vector>
<Vector name="ZFrontBottom" type="numeric" nEntries="4">
[hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
[hgcal:zHGCal8]</Vector>
<Vector name="RMinFront" type="numeric" nEntries="4">
[hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
[hgcal:rMinHGCal6], [hgcal:rMinHGCal8]</Vector>
<Vector name="SlopeTop" type="numeric" nEntries="4">
[hgcal:slope1], [hgcal:slope3], 0, 0</Vector>
<Vector name="ZFrontTop" type="numeric" nEntries="4">
[hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
[hgcal:zHGCal11]</Vector>
<Vector name="RMaxFront" type="numeric" nEntries="4">
[hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
[hgcal:rMaxHGCal11]</Vector>
</Algorithm>
<Algorithm name="hgcal:DDHGCalPassive">
<rParent name="hgcalPassive:HGCalHECoolingPlate"/>
<String name="ModuleMaterial" value="materials:Copper"/>
<Numeric name="Thickness" value="[hgcal:thickHECooling]"/>
<Numeric name="zMinBlock" value="[zMinBlockHEC2]"/>
<Numeric name="ModuleThick" value="[hgcal:thickHEModule2]"/>
<Numeric name="Parts" value="1"/>
<Numeric name="PhiStart" value="0"/>
<Vector name="TagLayer" type="string" nEntries="10">
L02, L03, L04, L05, L06, L07, L08, L09, L10, L11</Vector>
<Vector name="TagSector" type="string" nEntries="12">
F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11</Vector>
<Vector name="LayerNames" type="string" nEntries="1">
Copper</Vector>
<Vector name="LayerMaterials" type="string" nEntries="1">
materials:Copper</Vector>
<Vector name="LayerThickness" type="numeric" nEntries="1">
[hgcal:thickHECooling]</Vector>
<Vector name="LayerType" type="numeric" nEntries="0">
</Vector>
<Numeric name="ShiftTop" value="[shiftTop]"/>
<Numeric name="ShiftBottom" value="[shiftBottom]"/>
<Vector name="SlopeBottom" type="numeric" nEntries="4">
0, 0, 0, 0</Vector>
<Vector name="ZFrontBottom" type="numeric" nEntries="4">
[hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
[hgcal:zHGCal8]</Vector>
<Vector name="RMinFront" type="numeric" nEntries="4">
[hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
[hgcal:rMinHGCal6], [hgcal:rMinHGCal8]</Vector>
<Vector name="SlopeTop" type="numeric" nEntries="4">
[hgcal:slope1], [hgcal:slope3], 0, 0</Vector>
<Vector name="ZFrontTop" type="numeric" nEntries="4">
[hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
[hgcal:zHGCal11]</Vector>
<Vector name="RMaxFront" type="numeric" nEntries="4">
[hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
[hgcal:rMaxHGCal11]</Vector>
</Algorithm>
<Algorithm name="hgcal:DDHGCalPassive">
<rParent name="hgcalPassive:HGCalHECoolingPlate"/>
<String name="ModuleMaterial" value="materials:Copper"/>
<Numeric name="Thickness" value="[hgcal:thickHECooling]"/>
<Numeric name="zMinBlock" value="[zMinBlockHEC4]"/>
<Numeric name="ModuleThick" value="[hgcal:thickHEModule3]"/>
<Numeric name="Parts" value="1"/>
<Numeric name="PhiStart" value="0"/>
<Vector name="TagLayer" type="string" nEntries="10">
L12, L13, L14, L15, L16, L17, L18, L19, L20, L21</Vector>
<Vector name="TagSector" type="string" nEntries="12">
F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11</Vector>
<Vector name="LayerNames" type="string" nEntries="1">
Copper</Vector>
<Vector name="LayerMaterials" type="string" nEntries="1">
materials:Copper</Vector>
<Vector name="LayerThickness" type="numeric" nEntries="1">
[hgcal:thickHECooling]</Vector>
<Vector name="LayerType" type="numeric" nEntries="0">
</Vector>
<Numeric name="ShiftTop" value="[shiftTop]"/>
Expand Down
Loading