Skip to content

Commit a7f99cf

Browse files
cmsbuildcmsbuild
authored
Merge pull request #48222 from bsunanda/Phase2-hgx364G
Phase2-hgx364G Make coherent definitions of Wafer Size and Nominal Wafer Size for several scenarios using HGCal
2 parents 56a6c73 + f8aa59e commit a7f99cf

File tree

32 files changed

+2016
-15
lines changed

32 files changed

+2016
-15
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<ConstantsSection label="hgcal.xml" eval="true">
55
<Constant name="WaferSize" value="166.4408*mm"/>
6+
<Constant name="WaferSizeNominal" value="166.4408*mm"/>
67
<Constant name="WaferThickness" value="0.30*mm"/>
78
<Constant name="WaferThicknessFine" value="0.30*mm"/>
89
<Constant name="WaferThicknessCoarse1" value="0.20*mm"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<ConstantsSection label="hgcal.xml" eval="true">
55
<Constant name="WaferSize" value="167.4408*mm"/>
6+
<Constant name="WaferSizeNominal" value="167.4408*mm"/>
67
<Constant name="WaferThickness" value="0.30*mm"/>
78
<Constant name="WaferThicknessFine" value="0.30*mm"/>
89
<Constant name="WaferThicknessCoarse1" value="0.20*mm"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<ConstantsSection label="hgcal.xml" eval="true">
55
<Constant name="WaferSize" value="167.5408*mm"/>
6+
<Constant name="WaferSizeNominal" value="167.4408*mm"/>
67
<Constant name="WaferThickness" value="0.30*mm"/>
78
<Constant name="WaferThicknessFine" value="0.30*mm"/>
89
<Constant name="WaferThicknessCoarse1" value="0.20*mm"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<ConstantsSection label="hgcal.xml" eval="true">
55
<Constant name="WaferSize" value="167.4408*mm"/>
6+
<Constant name="WaferSizeNominal" value="167.4408*mm"/>
67
<Constant name="WaferThickness" value="0.30*mm"/>
78
<Constant name="WaferThicknessFine" value="0.30*mm"/>
89
<Constant name="WaferThicknessCoarse1" value="0.20*mm"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<ConstantsSection label="hgcal.xml" eval="true">
55
<Constant name="WaferSize" value="167.5408*mm"/>
6+
<Constant name="WaferSizeNominal" value="167.4408*mm"/>
67
<Constant name="WaferThickness" value="0.30*mm"/>
78
<Constant name="WaferThicknessFine" value="0.30*mm"/>
89
<Constant name="WaferThicknessCoarse1" value="0.20*mm"/>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<DDDefinition>
33

44
<ConstantsSection label="hgcal.xml" eval="true">
5-
<Constant name="WaferSize" value="167.4408*mm"/>
5+
<Constant name="WaferSize" value="167.44*mm"/>
6+
<Constant name="WaferSizeNominal" value="167.4408*mm"/>
67
<Constant name="WaferThickness" value="0.30*mm"/>
78
<Constant name="WaferThicknessFine" value="0.30*mm"/>
89
<Constant name="WaferThicknessCoarse1" value="0.20*mm"/>

‎Geometry/HGCalCommonData/data/hgcalCons/v16/hgcalCons.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<Parameter name="UseSimWt" value="0"/>
4141
<Parameter name="WaferMaskMode" value="2"/>
4242
<Parameter name="WaferZside" value="-1"/>
43+
<Parameter name="WaferNoGap" value="0"/>
4344
<Parameter name="LayerRotation" value="[hgcal:LayerRotation]"/>
4445
<Parameter name="Radius100to200" value="[hgcal:rad100200P0]"/>
4546
<Parameter name="Radius100to200" value="[hgcal:rad100200P1]"/>
@@ -103,6 +104,7 @@
103104
<Parameter name="UseSimWt" value="0"/>
104105
<Parameter name="WaferMaskMode" value="3"/>
105106
<Parameter name="WaferZside" value="-1"/>
107+
<Parameter name="WaferNoGap" value="0"/>
106108
<Parameter name="LayerRotation" value="[hgcal:LayerRotation]"/>
107109
<Parameter name="Radius100to200" value="[hgcal:rad100200P0]"/>
108110
<Parameter name="Radius100to200" value="[hgcal:rad100200P1]"/>
@@ -161,6 +163,7 @@
161163
<Parameter name="UseSimWt" value="0"/>
162164
<Parameter name="WaferMaskMode" value="4"/>
163165
<Parameter name="WaferZside" value="1"/>
166+
<Parameter name="WaferNoGap" value="0"/>
164167
<Parameter name="WaferThickness" value="[hgcal:ScintillatorThickness]"/>
165168
<Parameter name="MinimumTileSize" value="[MinimumTileSize]"/>
166169
<Parameter name="NPhiBinBH" value="[hgcal:NPhiBinBH]"/>
@@ -200,6 +203,7 @@
200203
<Parameter name="OnlyForHGCalNumbering" value="HGCal" eval="false"/>
201204
<Parameter name="WaferMode" value="HGCalGeometryMode::ExtrudedPolygon" eval="false"/>
202205
<Parameter name="WaferSize" value="[hgcal:WaferSize]"/>
206+
<Parameter name="WaferSizeNominal" value="[hgcal:WaferSizeNominal]"/>
203207
<Parameter name="WaferThickness" value="[hgcal:WaferThickness]"/>
204208
<Parameter name="SensorSeparation" value="[hgcal:SensorSeparation]"/>
205209
<Parameter name="SensorSizeOffset" value="[hgcal:SensorSizeOffset]"/>

‎Geometry/HGCalCommonData/data/hgcalCons/v17/hgcalCons.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<Parameter name="UseSimWt" value="0"/>
4141
<Parameter name="WaferMaskMode" value="5"/>
4242
<Parameter name="WaferZside" value="-1"/>
43+
<Parameter name="WaferNoGap" value="0"/>
4344
<Parameter name="LayerRotation" value="[hgcal:LayerRotation]"/>
4445
<Parameter name="Cassettes" value="6"/>
4546
<Parameter name="Radius100to200" value="[hgcal:rad100200P0]"/>
@@ -104,6 +105,7 @@
104105
<Parameter name="UseSimWt" value="0"/>
105106
<Parameter name="WaferMaskMode" value="6"/>
106107
<Parameter name="WaferZside" value="-1"/>
108+
<Parameter name="WaferNoGap" value="0"/>
107109
<Parameter name="LayerRotation" value="[hgcal:LayerRotation]"/>
108110
<Parameter name="Cassettes" value="12"/>
109111
<Parameter name="Radius100to200" value="[hgcal:rad100200P0]"/>
@@ -163,6 +165,7 @@
163165
<Parameter name="UseSimWt" value="0"/>
164166
<Parameter name="WaferMaskMode" value="7"/>
165167
<Parameter name="WaferZside" value="1"/>
168+
<Parameter name="WaferNoGap" value="0"/>
166169
<Parameter name="WaferThickness" value="[hgcal:ScintillatorThickness]"/>
167170
<Parameter name="MinimumTileSize" value="[MinimumTileSize]"/>
168171
<Parameter name="NPhiBinBH" value="[hgcal:NPhiBinBH]"/>
@@ -203,6 +206,7 @@
203206
<Parameter name="OnlyForHGCalNumbering" value="HGCal" eval="false"/>
204207
<Parameter name="WaferMode" value="HGCalGeometryMode::ExtrudedPolygon" eval="false"/>
205208
<Parameter name="WaferSize" value="[hgcal:WaferSize]"/>
209+
<Parameter name="WaferSizeNominal" value="[hgcal:WaferSizeNominal]"/>
206210
<Parameter name="WaferThickness" value="[hgcal:WaferThickness]"/>
207211
<Parameter name="SensorSeparation" value="[hgcal:SensorSeparation]"/>
208212
<Parameter name="SensorSizeOffset" value="[hgcal:SensorSizeOffset]"/>

‎Geometry/HGCalCommonData/data/hgcalCons/v17n/hgcalCons.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<Parameter name="UseSimWt" value="1"/>
4141
<Parameter name="WaferMaskMode" value="5"/>
4242
<Parameter name="WaferZside" value="-1"/>
43+
<Parameter name="WaferNoGap" value="0"/>
4344
<Parameter name="LayerRotation" value="[hgcal:LayerRotation]"/>
4445
<Parameter name="Cassettes" value="6"/>
4546
<Parameter name="Radius100to200" value="[hgcal:rad100200P0]"/>
@@ -104,6 +105,7 @@
104105
<Parameter name="UseSimWt" value="1"/>
105106
<Parameter name="WaferMaskMode" value="6"/>
106107
<Parameter name="WaferZside" value="-1"/>
108+
<Parameter name="WaferNoGap" value="0"/>
107109
<Parameter name="LayerRotation" value="[hgcal:LayerRotation]"/>
108110
<Parameter name="Cassettes" value="12"/>
109111
<Parameter name="Radius100to200" value="[hgcal:rad100200P0]"/>
@@ -163,6 +165,7 @@
163165
<Parameter name="UseSimWt" value="0"/>
164166
<Parameter name="WaferMaskMode" value="7"/>
165167
<Parameter name="WaferZside" value="1"/>
168+
<Parameter name="WaferNoGap" value="0"/>
166169
<Parameter name="WaferThickness" value="[hgcal:ScintillatorThickness]"/>
167170
<Parameter name="MinimumTileSize" value="[MinimumTileSize]"/>
168171
<Parameter name="NPhiBinBH" value="[hgcal:NPhiBinBH]"/>
@@ -203,6 +206,7 @@
203206
<Parameter name="OnlyForHGCalNumbering" value="HGCal" eval="false"/>
204207
<Parameter name="WaferMode" value="HGCalGeometryMode::ExtrudedPolygon" eval="false"/>
205208
<Parameter name="WaferSize" value="[hgcal:WaferSize]"/>
209+
<Parameter name="WaferSizeNominal" value="[hgcal:WaferSizeNominal]"/>
206210
<Parameter name="WaferThickness" value="[hgcal:WaferThickness]"/>
207211
<Parameter name="SensorSeparation" value="[hgcal:SensorSeparation]"/>
208212
<Parameter name="SensorSizeOffset" value="[hgcal:SensorSizeOffset]"/>

0 commit comments

Comments
 (0)