Skip to content

Commit 08c1709

Browse files
cmsbuildcmsbuild
authored
Merge pull request cms-sw#34063 from bsunanda/Run4-hgx286N
Run4-hgx286N Update HGCal xml files in view of future extension of algorithms
2 parents 9abd444 + 00db7dc commit 08c1709

File tree

10 files changed

+37
-0
lines changed

10 files changed

+37
-0
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,12 @@
123123
<Constant name="rMaxHGCalHEmix5" value="[rMaxHGCal12]"/>
124124
</ConstantsSection>
125125

126+
<RotationSection label="hgcal.xml">
127+
<Rotation name="LayerRotation" phiX="[LayerRotation]" thetaX="90*deg"
128+
phiY="(90*deg+[LayerRotation])" thetaY="90*deg"
129+
phiZ="0*deg" thetaZ="0*deg"/>
130+
</RotationSection>
131+
126132
<SolidSection label="hgcal.xml" eval="true">
127133
<Polycone name="HGCalService" startPhi="0*deg" deltaPhi="360*deg">
128134
<ZSection z="[zHGCal0]" rMin="[rMinHGCal1]" rMax="[rMaxHGCal0S]"/>

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

Lines changed: 8 additions & 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="WaferThickness" value="0.31*mm"/>
67
<Constant name="WaferThicknessFine" value="0.30*mm"/>
78
<Constant name="WaferThicknessCoarse1" value="0.20*mm"/>
89
<Constant name="WaferThicknessCoarse2" value="0.30*mm"/>
@@ -18,6 +19,7 @@
1819
<Constant name="NumberOfCellsCoarse" value="8"/>
1920
<Constant name="NPhiBinBH" value="288"/>
2021
<Constant name="FirstMixedLayer" value="9"/>
22+
<Constant name="LayerRotation" value="30*deg"/>
2123
<Constant name="rad100200P0" value="-1.60163E-06"/>
2224
<Constant name="rad100200P1" value="2.50640E-03"/>
2325
<Constant name="rad100200P2" value="-1.46943E+00"/>
@@ -127,6 +129,12 @@
127129
<Constant name="rMaxHGCalHEmix5" value="[rMaxHGCal12]"/>
128130
</ConstantsSection>
129131

132+
<RotationSection label="hgcal.xml">
133+
<Rotation name="LayerRotation" phiX="[LayerRotation]" thetaX="90*deg"
134+
phiY="(90*deg+[LayerRotation])" thetaY="90*deg"
135+
phiZ="0*deg" thetaZ="0*deg"/>
136+
</RotationSection>
137+
130138
<SolidSection label="hgcal.xml" eval="true">
131139
<Polycone name="HGCalService" startPhi="0*deg" deltaPhi="360*deg">
132140
<ZSection z="[zHGCal0]" rMin="[rMinHGCal1]" rMax="[rMaxHGCal0S]"/>

‎Geometry/HGCalCommonData/data/hgcalEE/v15/hgcal.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,12 @@
111111
<Constant name="rMaxHGCalHEmix5" value="[rMaxHGCal12]"/>
112112
</ConstantsSection>
113113

114+
<RotationSection label="hgcal.xml">
115+
<Rotation name="LayerRotation" phiX="[LayerRotation]" thetaX="90*deg"
116+
phiY="(90*deg+[LayerRotation])" thetaY="90*deg"
117+
phiZ="0*deg" thetaZ="0*deg"/>
118+
</RotationSection>
119+
114120
<SolidSection label="hgcal.xml" eval="true">
115121
<Polycone name="HGCalService" startPhi="0*deg" deltaPhi="360*deg">
116122
<ZSection z="[zHGCal0]" rMin="[rMinHGCal1]" rMax="[rMaxHGCal0S]"/>

‎Geometry/HGCalCommonData/data/hgcalEE/v15/hgcalEE.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<Numeric name="waferSize" value="[hgcal:WaferSize]"/>
1616
<Numeric name="SensorSeparation" value="[hgcal:SensorSeparation]"/>
1717
<Numeric name="Sectors" value="36"/>
18+
<String name="LayerRotation" value="hgcal:LayerRotation"/>
1819
<Vector name="WaferNamesFull" type="string" nEntries="6">
1920
hgcalwafer:HGCalEEWafer0Fine, hgcalwafer:HGCalEEWafer0Coarse1,
2021
hgcalwafer:HGCalEEWafer0Coarse2, hgcalwafer:HGCalEEWafer1Fine,

‎Geometry/HGCalCommonData/data/hgcalHEmix/v15/hgcal.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@
9494
<Constant name="rMaxHGCalHEmix5" value="[rMaxHGCal12]"/>
9595
</ConstantsSection>
9696

97+
<RotationSection label="hgcal.xml">
98+
<Rotation name="LayerRotation" phiX="[LayerRotation]" thetaX="90*deg"
99+
phiY="(90*deg+[LayerRotation])" thetaY="90*deg"
100+
phiZ="0*deg" thetaZ="0*deg"/>
101+
</RotationSection>
102+
97103
<SolidSection label="hgcal.xml" eval="true">
98104
<Polycone name="HGCalService" startPhi="0*deg" deltaPhi="360*deg">
99105
<ZSection z="[zHGCal0]" rMin="[rMinHGCal1]" rMax="[rMaxHGCal0S]"/>

‎Geometry/HGCalCommonData/data/hgcalHEmix/v15/hgcalHEmix.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<Numeric name="waferSize" value="[hgcal:WaferSize]"/>
1717
<Numeric name="SensorSeparation" value="[hgcal:SensorSeparation]"/>
1818
<Numeric name="Sectors" value="36"/>
19+
<String name="LayerRotation" value="hgcal:LayerRotation"/>
1920
<Vector name="SlopeBottom" type="numeric" nEntries="4">
2021
0, 0, 0, 0</Vector>
2122
<Vector name="ZFrontBottom" type="numeric" nEntries="4">

‎Geometry/HGCalCommonData/data/hgcalHEmix/v15/hgcalHEmixTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<Numeric name="waferSize" value="[hgcal:WaferSize]"/>
1717
<Numeric name="SensorSeparation" value="[hgcal:SensorSeparation]"/>
1818
<Numeric name="Sectors" value="36"/>
19+
<String name="LayerRotation" value="hgcal:LayerRotation"/>
1920
<Vector name="SlopeBottom" type="numeric" nEntries="4">
2021
0, 0, 0, 0</Vector>
2122
<Vector name="ZFrontBottom" type="numeric" nEntries="4">

‎Geometry/HGCalCommonData/data/hgcalHEsil/v15/hgcal.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,12 @@
111111
<Constant name="rMaxHGCalHEmix5" value="[rMaxHGCal12]"/>
112112
</ConstantsSection>
113113

114+
<RotationSection label="hgcal.xml">
115+
<Rotation name="LayerRotation" phiX="[LayerRotation]" thetaX="90*deg"
116+
phiY="(90*deg+[LayerRotation])" thetaY="90*deg"
117+
phiZ="0*deg" thetaZ="0*deg"/>
118+
</RotationSection>
119+
114120
<SolidSection label="hgcal.xml" eval="true">
115121
<Polycone name="HGCalService" startPhi="0*deg" deltaPhi="360*deg">
116122
<ZSection z="[zHGCal0]" rMin="[rMinHGCal1]" rMax="[rMaxHGCal0S]"/>

‎Geometry/HGCalCommonData/data/hgcalHEsil/v15/hgcalHEsil.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<Numeric name="waferSize" value="[hgcal:WaferSize]"/>
1616
<Numeric name="SensorSeparation" value="[hgcal:SensorSeparation]"/>
1717
<Numeric name="Sectors" value="36"/>
18+
<String name="LayerRotation" value="hgcal:LayerRotation"/>
1819
<Vector name="WaferNamesFull" type="string" nEntries="3">
1920
hgcalwafer:HGCalHEWafer0Fine, hgcalwafer:HGCalHEWafer0Coarse1,
2021
hgcalwafer:HGCalHEWafer0Coarse2</Vector>

‎Geometry/HGCalCommonData/data/hgcalcell/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="WaferThickness" value="0.31*mm"/>
67
<Constant name="WaferThicknessFine" value="0.30*mm"/>
78
<Constant name="WaferThicknessCoarse1" value="0.20*mm"/>
89
<Constant name="WaferThicknessCoarse2" value="0.30*mm"/>

0 commit comments

Comments
 (0)