Merge pull request #40781 from bsunanda/Phase2-gex335R

Phase2-gex335R Backport #40644 to CMSSW_13_0_X to complete v17 definition of HGCal with different lateral sizes of the components inside a silicon module
cms-sw · Feb 21, 2023 · a3b3d4e · a3b3d4e
2 parents 574e102 + 492fd68
commit a3b3d4e
Show file tree

Hide file tree

Showing 22 changed files with 743 additions and 319 deletions.
diff --git a/Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml
@@ -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"/>

diff --git a/Geometry/HGCalCommonData/data/hgcalcell/v17/hgcal.xml b/Geometry/HGCalCommonData/data/hgcalcell/v17/hgcal.xml
@@ -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"/>

diff --git a/Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml b/Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml
@@ -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]"/>
@@ -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]"/>
@@ -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]"/>
@@ -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]"/>
@@ -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]"/>
@@ -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]"/>
@@ -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]"/>
@@ -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]"/>
@@ -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]"/>
@@ -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]"/>
@@ -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]"/>
@@ -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]"/>
@@ -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]"/>

diff --git a/Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcal.xml b/Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcal.xml
@@ -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"/>