Skip to content

Commit cd7129c

Browse files
cmsbuildcmsbuild
authored
Merge pull request cms-sw#42974 from bsunanda/Phase2-TB76Z
Phase2-TB76Z Correct the testbeam setup of July 2023 HGCal
2 parents e518466 + a42e6ad commit cd7129c

File tree

2 files changed

+39
-18
lines changed

2 files changed

+39
-18
lines changed

‎Geometry/HGCalTBCommonData/data/TB230/Jul230/hgcalBeam.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,22 @@
77
<Constant name="upstreamDzby2" value="60.0*cm"/>
88
<Constant name="upstreamZ" value="-[upstreamDzby2]"/>
99
<Constant name="backDz" value="51.5*cm"/>
10+
<Constant name="gapDz" value="20.0*cm"/>
1011
<Constant name="s4Dxby2" value="7.0*cm"/>
1112
<Constant name="s4Dzby2" value="5.0*mm"/>
12-
<Constant name="s4Z" value="(-[upstreamDzby2]+[backDz]+[s4Dzby2])"/>
13+
<Constant name="s4Z" value="([upstreamDzby2]-[backDz]-[s4Dzby2])"/>
1314
<Constant name="s3Dxby2" value="1.0*cm"/>
1415
<Constant name="s3Dzby2" value="5.0*mm"/>
1516
<Constant name="s3Dzby2" value="5.0*mm"/>
16-
<Constant name="s3Z" value="([s4Z]+[s4Dzby2]+[s3Dzby2])"/>
17+
<Constant name="s3Z" value="([s4Z]-[s4Dzby2]-[gapDz]-[s3Dzby2])"/>
1718
<Constant name="s2Dxby2" value="2.0*cm"/>
1819
<Constant name="s2Dyby2" value="2.0*mm"/>
1920
<Constant name="s2Dzby2" value="5.0*mm"/>
20-
<Constant name="s2Z" value="([s3Z]+[s3Dzby2]+[s2Dzby2])"/>
21+
<Constant name="s2Z" value="([s3Z]-[s3Dzby2]-[gapDz]-[s2Dzby2])"/>
2122
<Constant name="s1Dxby2" value="7.0*cm"/>
2223
<Constant name="s1Dzby2" value="5.0*mm"/>
2324
<Constant name="s1Dzby2" value="5.0*mm"/>
24-
<Constant name="s1Z" value="([s2Z]+[s2Dzby2]+[s1Dzby2])"/>
25+
<Constant name="s1Z" value="([s2Z]-[s2Dzby2]-[gapDz]-[s1Dzby2])"/>
2526
</ConstantsSection>
2627

2728
<SolidSection label="hgcalBeam.xml">

‎Geometry/HGCalTBCommonData/data/TB230/Jul230/hgcalEE.xml‎

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
<Constant name="airGap3" value="20.0*mm"/>
1313
<Constant name="airGap4" value="10.0*mm"/>
1414
<Constant name="airGap5" value="20.0*mm"/>
15-
<Constant name="airGap6" value="365.40*mm"/>
15+
<Constant name="airGap6" value="353.40*mm"/>
1616
<Constant name="absPb1T" value="5.0*mm"/>
1717
<Constant name="absPb2T" value="2.0*mm"/>
18+
<Constant name="CuPlateT" value="6.0*mm"/>
1819
<Constant name="zShift" value="0.5*([absPb1T]+[airGap1])"/>
1920
<Constant name="zposAl1" value="([hgcal:zHGCalEE1]+0.5*[crateT])"/>
2021
<Constant name="zposGap0" value="([zposAl1]+0.5*([crateT]+[airGap0]))"/>
@@ -49,26 +50,29 @@
4950
<Constant name="zposAbs15" value="([zposGap15]+0.5*([airGap2]+[absPb2T]))"/>
5051
<Constant name="zposGap16" value="([zposAbs15]+0.5*([absPb2T]+[airGap3]))"/>
5152
<Constant name="zposMod1" value="([zposGap16]+0.5*([airGap3]+[moduleT]))"/>
52-
<Constant name="zposGap17" value="([zposMod1]+0.5*([moduleT]+[airGap4]))"/>
53+
<Constant name="zposCu1" value="([zposMod1]+0.5*([moduleT]+[CuPlateT]))"/>
54+
<Constant name="zposGap17" value="([zposCu1]+0.5*([CuPlateT]+[airGap4]))"/>
5355
<Constant name="zposAbs17" value="([zposGap17]+0.5*([airGap4]+[absPb2T]))"/>
5456
<Constant name="zposGap18" value="([zposAbs17]+0.5*([absPb2T]+[airGap5]))"/>
5557
<Constant name="zposMod2" value="([zposGap18]+0.5*([airGap5]+[moduleT]))"/>
56-
<Constant name="zposGap19" value="([zposMod2]+0.5*([moduleT]+[airGap6]))"/>
58+
<Constant name="zposCu2" value="([zposMod2]+0.5*([moduleT]+[CuPlateT]))"/>
59+
<Constant name="zposGap19" value="([zposCu2]+0.5*([CuPlateT]+[airGap6]))"/>
5760
<Constant name="zposAl2" value="([zposGap19]+0.5*([airGap6]+[crateT]))"/>
5861
</ConstantsSection>
5962

6063
<SolidSection label="hgcalEE.xml" eval="true">
61-
<Box name="HGCalEELayer" dx="[absorbW]" dy="[absorbH]" dz="0.5*[moduleT]"/>
62-
<Box name="HGCalEEAlCover" dx="[absorbW]" dy="[absorbH]" dz="0.5*[crateT]"/>
63-
<Box name="HGCalEEAirGap0" dx="[absorbW]" dy="[absorbH]" dz="0.5*[airGap0]"/>
64-
<Box name="HGCalEEAirGap1" dx="[absorbW]" dy="[absorbH]" dz="0.5*[airGap1]"/>
65-
<Box name="HGCalEEAirGap2" dx="[absorbW]" dy="[absorbH]" dz="0.5*[airGap2]"/>
66-
<Box name="HGCalEEAirGap3" dx="[absorbW]" dy="[absorbH]" dz="0.5*[airGap3]"/>
67-
<Box name="HGCalEEAirGap4" dx="[absorbW]" dy="[absorbH]" dz="0.5*[airGap4]"/>
68-
<Box name="HGCalEEAirGap5" dx="[absorbW]" dy="[absorbH]" dz="0.5*[airGap5]"/>
69-
<Box name="HGCalEEAirGap6" dx="[absorbW]" dy="[absorbH]" dz="0.5*[airGap6]"/>
70-
<Box name="HGCalEEAbsPb1" dx="[absorbW]" dy="[absorbH]" dz="0.5*[absPb1T]"/>
71-
<Box name="HGCalEEAbsPb2" dx="[absorbW]" dy="[absorbH]" dz="0.5*[absPb2T]"/>
64+
<Box name="HGCalEELayer" dx="[absorbW]" dy="[absorbH]" dz="0.5*[moduleT]"/>
65+
<Box name="HGCalEEAlCover" dx="[absorbW]" dy="[absorbH]" dz="0.5*[crateT]"/>
66+
<Box name="HGCalEEAirGap0" dx="[absorbW]" dy="[absorbH]" dz="0.5*[airGap0]"/>
67+
<Box name="HGCalEEAirGap1" dx="[absorbW]" dy="[absorbH]" dz="0.5*[airGap1]"/>
68+
<Box name="HGCalEEAirGap2" dx="[absorbW]" dy="[absorbH]" dz="0.5*[airGap2]"/>
69+
<Box name="HGCalEEAirGap3" dx="[absorbW]" dy="[absorbH]" dz="0.5*[airGap3]"/>
70+
<Box name="HGCalEEAirGap4" dx="[absorbW]" dy="[absorbH]" dz="0.5*[airGap4]"/>
71+
<Box name="HGCalEEAirGap5" dx="[absorbW]" dy="[absorbH]" dz="0.5*[airGap5]"/>
72+
<Box name="HGCalEEAirGap6" dx="[absorbW]" dy="[absorbH]" dz="0.5*[airGap6]"/>
73+
<Box name="HGCalEEAbsPb1" dx="[absorbW]" dy="[absorbH]" dz="0.5*[absPb1T]"/>
74+
<Box name="HGCalEEAbsPb2" dx="[absorbW]" dy="[absorbH]" dz="0.5*[absPb2T]"/>
75+
<Box name="HGCalEECuPlate" dx="[absorbW]" dy="[absorbH]" dz="0.5*[CuPlateT]"/>
7276
</SolidSection>
7377

7478
<LogicalPartSection label="hgcalEE.xml">
@@ -92,6 +96,10 @@
9296
<rSolid name="HGCalEEAbsPb2"/>
9397
<rMaterial name="materials:Lead"/>
9498
</LogicalPart>
99+
<LogicalPart name="HGCalEECuPlate" category="unspecified">
100+
<rSolid name="HGCalEECuPlate"/>
101+
<rMaterial name="materials:Copper"/>
102+
</LogicalPart>
95103
<LogicalPart name="HGCalEEAirGap0" category="unspecified">
96104
<rSolid name="HGCalEEAirGap0"/>
97105
<rMaterial name="materials:Air"/>
@@ -157,6 +165,18 @@
157165
<Translation x="0.0*mm" y="0.0*mm" z="[zposMod2]"/>
158166
<rRotation name="rotations:000D"/>
159167
</PosPart>
168+
<PosPart copyNumber="1">
169+
<rParent name="hgcal:HGCalEE"/>
170+
<rChild name="hgcalEE:HGCalEECuPlate"/>
171+
<Translation x="0.0*mm" y="0.0*mm" z="[zposCu1]"/>
172+
<rRotation name="rotations:000D"/>
173+
</PosPart>
174+
<PosPart copyNumber="2">
175+
<rParent name="hgcal:HGCalEE"/>
176+
<rChild name="hgcalEE:HGCalEECuPlate"/>
177+
<Translation x="0.0*mm" y="0.0*mm" z="[zposCu2]"/>
178+
<rRotation name="rotations:000D"/>
179+
</PosPart>
160180
<PosPart copyNumber="1">
161181
<rParent name="hgcal:HGCalEE"/>
162182
<rChild name="hgcalEE:HGCalEEAirGap0"/>

0 commit comments

Comments
 (0)