Skip to content

Commit

Permalink
Backport #40644 to complete v17 definition of HGCal with different la…
Browse files Browse the repository at this point in the history 
…teral sizes of the components inside a silicon module
  • Loading branch information
Sunanda committed Feb 16, 2023
1 parent ae61158 commit d9d3968
Show file tree
Hide file tree
Showing 21 changed files with 739 additions and 319 deletions.
5 changes: 3 additions & 2 deletions Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
<DDDefinition>

<ConstantsSection label="hgcal.xml" eval="true">
<Constant name="WaferSize" value="166.4408*mm"/>
<Constant name="WaferSize" value="167.4408*mm"/>
<Constant name="WaferThickness" value="0.30*mm"/>
<Constant name="WaferThicknessFine" value="0.30*mm"/>
<Constant name="WaferThicknessCoarse1" value="0.20*mm"/>
<Constant name="WaferThicknessCoarse2" value="0.30*mm"/>
<Constant name="SensorSeparation" value="1.00*mm"/>
<Constant name="SensorSeparation" value="0.10*mm"/>
<Constant name="SensorSizeOffset" value="0.87*mm"/>
<Constant name="MouseBite" value="5.00*mm"/>
<Constant name="ModuleThicknessEE" value="9.325*mm"/>
<Constant name="ModuleThicknessHE" value="8.70*mm"/>
Expand Down
5 changes: 3 additions & 2 deletions Geometry/HGCalCommonData/data/hgcalcell/v17/hgcal.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
<DDDefinition>

<ConstantsSection label="hgcal.xml" eval="true">
<Constant name="WaferSize" value="166.4408*mm"/>
<Constant name="SensorSeparation" value="1.00*mm"/>
<Constant name="WaferSize" value="167.4408*mm"/>
<Constant name="SensorSeparation" value="0.10*mm"/>
<Constant name="SensorSizeOffset" value="0.87*mm"/>
<Constant name="WaferThickness" value="0.30*mm"/>
<Constant name="WaferThicknessFine" value="0.30*mm"/>
<Constant name="WaferThicknessCoarse1" value="0.20*mm"/>
Expand Down
25 changes: 13 additions & 12 deletions Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<ConstantsSection label="hgcalcell.xml" eval="true">
<Constant name="WaferSize" value="[hgcal:WaferSize]"/>
<Constant name="SensorSeparation" value="[hgcal:SensorSeparation]"/>
<Constant name="SensorSizeOffset" value="[hgcal:SensorSizeOffset]"/>
<Constant name="WaferThicknessFine" value="[hgcal:WaferThicknessFine]"/>
<Constant name="WaferThicknessCoarse1" value="[hgcal:WaferThicknessCoarse1]"/>
<Constant name="WaferThicknessCoarse2" value="[hgcal:WaferThicknessCoarse2]"/>
Expand All @@ -18,7 +19,7 @@
<Algorithm name="hgcal:DDHGCalCell">
<rParent name="hgcalwafer:HGCalCell"/>
<Numeric name="WaferSize" value="[WaferSize]"/>
<Numeric name="WaferSeparation" value="[SensorSeparation]"/>
<Numeric name="WaferSeparation" value="[SensorSizeOffset]"/>
<Numeric name="AddWaferSeparation" value="1"/>
<Numeric name="WaferThick" value="[WaferThicknessFine]"/>
<Numeric name="CellThick" value="[CellThicknessFine]"/>
Expand Down Expand Up @@ -61,7 +62,7 @@
<Algorithm name="hgcal:DDHGCalCell">
<rParent name="hgcalwafer:HGCalCell"/>
<Numeric name="WaferSize" value="[WaferSize]"/>
<Numeric name="WaferSeparation" value="[SensorSeparation]"/>
<Numeric name="WaferSeparation" value="[SensorSizeOffset]"/>
<Numeric name="AddWaferSeparation" value="1"/>
<Numeric name="WaferThick" value="[WaferThicknessFine]"/>
<Numeric name="CellThick" value="[CellThicknessFine]"/>
Expand Down Expand Up @@ -104,7 +105,7 @@
<Algorithm name="hgcal:DDHGCalCell">
<rParent name="hgcalwafer:HGCalCell"/>
<Numeric name="WaferSize" value="[WaferSize]"/>
<Numeric name="WaferSeparation" value="[SensorSeparation]"/>
<Numeric name="WaferSeparation" value="[SensorSizeOffset]"/>
<Numeric name="AddWaferSeparation" value="1"/>
<Numeric name="WaferThick" value="[WaferThicknessCoarse1]"/>
<Numeric name="CellThick" value="[CellThicknessCoarse1]"/>
Expand Down Expand Up @@ -147,7 +148,7 @@
<Algorithm name="hgcal:DDHGCalCell">
<rParent name="hgcalwafer:HGCalCell"/>
<Numeric name="WaferSize" value="[WaferSize]"/>
<Numeric name="WaferSeparation" value="[SensorSeparation]"/>
<Numeric name="WaferSeparation" value="[SensorSizeOffset]"/>
<Numeric name="AddWaferSeparation" value="1"/>
<Numeric name="WaferThick" value="[WaferThicknessCoarse1]"/>
<Numeric name="CellThick" value="[CellThicknessCoarse1]"/>
Expand Down Expand Up @@ -190,7 +191,7 @@
<Algorithm name="hgcal:DDHGCalCell">
<rParent name="hgcalwafer:HGCalCell"/>
<Numeric name="WaferSize" value="[WaferSize]"/>
<Numeric name="WaferSeparation" value="[SensorSeparation]"/>
<Numeric name="WaferSeparation" value="[SensorSizeOffset]"/>
<Numeric name="AddWaferSeparation" value="1"/>
<Numeric name="WaferThick" value="[WaferThicknessCoarse2]"/>
<Numeric name="CellThick" value="[CellThicknessCoarse2]"/>
Expand Down Expand Up @@ -233,7 +234,7 @@
<Algorithm name="hgcal:DDHGCalCell">
<rParent name="hgcalwafer:HGCalCell"/>
<Numeric name="WaferSize" value="[WaferSize]"/>
<Numeric name="WaferSeparation" value="[SensorSeparation]"/>
<Numeric name="WaferSeparation" value="[SensorSizeOffset]"/>
<Numeric name="AddWaferSeparation" value="1"/>
<Numeric name="WaferThick" value="[WaferThicknessCoarse2]"/>
<Numeric name="CellThick" value="[CellThicknessCoarse2]"/>
Expand Down Expand Up @@ -276,7 +277,7 @@
<Algorithm name="hgcal:DDHGCalCell">
<rParent name="hgcalwafer:HGCalCell"/>
<Numeric name="WaferSize" value="[WaferSize]"/>
<Numeric name="WaferSeparation" value="[SensorSeparation]"/>
<Numeric name="WaferSeparation" value="[SensorSizeOffset]"/>
<Numeric name="AddWaferSeparation" value="1"/>
<Numeric name="WaferThick" value="[WaferThicknessFine]"/>
<Numeric name="CellThick" value="[CellThicknessFine]"/>
Expand Down Expand Up @@ -319,7 +320,7 @@
<Algorithm name="hgcal:DDHGCalCell">
<rParent name="hgcalwafer:HGCalCell"/>
<Numeric name="WaferSize" value="[WaferSize]"/>
<Numeric name="WaferSeparation" value="[SensorSeparation]"/>
<Numeric name="WaferSeparation" value="[SensorSizeOffset]"/>
<Numeric name="AddWaferSeparation" value="1"/>
<Numeric name="WaferThick" value="[WaferThicknessFine]"/>
<Numeric name="CellThick" value="[CellThicknessFine]"/>
Expand Down Expand Up @@ -362,7 +363,7 @@
<Algorithm name="hgcal:DDHGCalCell">
<rParent name="hgcalwafer:HGCalCell"/>
<Numeric name="WaferSize" value="[WaferSize]"/>
<Numeric name="WaferSeparation" value="[SensorSeparation]"/>
<Numeric name="WaferSeparation" value="[SensorSizeOffset]"/>
<Numeric name="AddWaferSeparation" value="1"/>
<Numeric name="WaferThick" value="[WaferThicknessCoarse1]"/>
<Numeric name="CellThick" value="[CellThicknessCoarse1]"/>
Expand Down Expand Up @@ -405,7 +406,7 @@
<Algorithm name="hgcal:DDHGCalCell">
<rParent name="hgcalwafer:HGCalCell"/>
<Numeric name="WaferSize" value="[WaferSize]"/>
<Numeric name="WaferSeparation" value="[SensorSeparation]"/>
<Numeric name="WaferSeparation" value="[SensorSizeOffset]"/>
<Numeric name="AddWaferSeparation" value="1"/>
<Numeric name="WaferThick" value="[WaferThicknessCoarse1]"/>
<Numeric name="CellThick" value="[CellThicknessCoarse1]"/>
Expand Down Expand Up @@ -448,7 +449,7 @@
<Algorithm name="hgcal:DDHGCalCell">
<rParent name="hgcalwafer:HGCalCell"/>
<Numeric name="WaferSize" value="[WaferSize]"/>
<Numeric name="WaferSeparation" value="[SensorSeparation]"/>
<Numeric name="WaferSeparation" value="[SensorSizeOffset]"/>
<Numeric name="AddWaferSeparation" value="1"/>
<Numeric name="WaferThick" value="[WaferThicknessCoarse2]"/>
<Numeric name="CellThick" value="[CellThicknessCoarse2]"/>
Expand Down Expand Up @@ -491,7 +492,7 @@
<Algorithm name="hgcal:DDHGCalCell">
<rParent name="hgcalwafer:HGCalCell"/>
<Numeric name="WaferSize" value="[WaferSize]"/>
<Numeric name="WaferSeparation" value="[SensorSeparation]"/>
<Numeric name="WaferSeparation" value="[SensorSizeOffset]"/>
<Numeric name="AddWaferSeparation" value="1"/>
<Numeric name="WaferThick" value="[WaferThicknessCoarse2]"/>
<Numeric name="CellThick" value="[CellThicknessCoarse2]"/>
Expand Down
5 changes: 3 additions & 2 deletions Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcal.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
<DDDefinition>

<ConstantsSection label="hgcal.xml" eval="true">
<Constant name="WaferSize" value="166.4408*mm"/>
<Constant name="WaferSize" value="167.4408*mm"/>
<Constant name="WaferThickness" value="0.30*mm"/>
<Constant name="WaferThicknessFine" value="0.30*mm"/>
<Constant name="WaferThicknessCoarse1" value="0.20*mm"/>
<Constant name="WaferThicknessCoarse2" value="0.30*mm"/>
<Constant name="SensorSeparation" value="1.00*mm"/>
<Constant name="SensorSeparation" value="0.10*mm"/>
<Constant name="SensorSizeOffset" value="0.87*mm"/>
<Constant name="ModuleThicknessEE" value="9.325*mm"/>
<Constant name="ModuleThicknessHE" value="8.70*mm"/>
<Constant name="CellThicknessFine" value="0.12*mm"/>
Expand Down
Loading

0 comments on commit d9d3968

Please sign in to comment.