Skip to content

Commit 0c6d4a0

Browse files
authored
Merge pull request #48102 from fabferro/pps2025GeoBugFix
PPS 2025 Reconstruction geometry BUG FIX
2 parents a704da5 + 708ee5b commit 0c6d4a0

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Geometry/VeryForwardData/data/CTPPS_2025/Stations/Reco/v1/RP_210_Left_Station.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,14 +236,14 @@
236236
<rChild name="RP_Box_004:RP_box_primary_vacuum"/>
237237
<!-- <rRotation name="RP_Transformations:RP_y_180_rot" -->
238238
<rRotation name="RP_210_Left_minus_Sec_Rotation"/>
239-
<Translation x="0*mm" y="[RP_Dist_Beam_Cent:RP_210_Left_Det_Dist_4]+[RP_Box:RP_Box_primary_vacuum_y]/2" z="-([RP_210_Left_Sec_Vert_z]-[RP_210_Left_Station_Length]/2)"/>
239+
<Translation x="([RP_Dist_Beam_Cent:RP_210_Left_Det_Dist_4]+[RP_Box:RP_Box_primary_vacuum_y]/2)*tan([RP_210_Left_Sec_Rot_Angle])" y="[RP_Dist_Beam_Cent:RP_210_Left_Det_Dist_4]+[RP_Box:RP_Box_primary_vacuum_y]/2" z="-([RP_210_Left_Sec_Vert_z]-[RP_210_Left_Station_Length]/2)"/>
240240
</PosPart>
241241
<PosPart copyNumber="5">
242242
<rParent name="RP_210_Left_Station_Vacuum_3_Far"/>
243243
<rChild name="RP_Box_005:RP_box_primary_vacuum"/>
244-
<!-- sformations:RP_180_z_180_y_rot -->
244+
<!-- transformations:RP_180_z_180_y_rot -->
245245
<rRotation name="RP_210_Left_180_minus_Sec_Rotation"/>
246-
<Translation x="0*mm" y="-[RP_Dist_Beam_Cent:RP_210_Left_Det_Dist_5]-[RP_Box:RP_Box_primary_vacuum_y]/2" z="-([RP_210_Left_Sec_Vert_z]-[RP_210_Left_Station_Length]/2)"/>
246+
<Translation x="(-[RP_Dist_Beam_Cent:RP_210_Left_Det_Dist_5]-[RP_Box:RP_Box_primary_vacuum_y]/2)*tan([RP_210_Left_Sec_Rot_Angle])" y="-[RP_Dist_Beam_Cent:RP_210_Left_Det_Dist_5]-[RP_Box:RP_Box_primary_vacuum_y]/2" z="-([RP_210_Left_Sec_Vert_z]-[RP_210_Left_Station_Length]/2)"/>
247247
</PosPart>
248248
</PosPartSection>
249249
</DDDefinition>

Geometry/VeryForwardData/data/CTPPS_2025/Stations/Reco/v1/RP_210_Right_Station.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,14 +228,16 @@
228228
<rParent name="RP_210_Right_Station_Vacuum_3_Far"/>
229229
<rChild name="RP_Box_104:RP_box_primary_vacuum"/>
230230
<rRotation name="RP_210_Right_minus_Sec_Rotation"/>
231-
<Translation x="0*mm" y="[RP_Dist_Beam_Cent:RP_210_Right_Det_Dist_4]+[RP_Box:RP_Box_primary_vacuum_y]/2" z="[RP_210_Right_Sec_Vert_z]-[RP_210_Right_Station_Length]/2"/>
231+
<!-- x = y*tan(theta) -->
232+
<Translation x="([RP_Dist_Beam_Cent:RP_210_Right_Det_Dist_4]+[RP_Box:RP_Box_primary_vacuum_y]/2)*tan([RP_210_Right_Sec_Rot_Angle])" y="[RP_Dist_Beam_Cent:RP_210_Right_Det_Dist_4]+[RP_Box:RP_Box_primary_vacuum_y]/2" z="[RP_210_Right_Sec_Vert_z]-[RP_210_Right_Station_Length]/2"/>
232233
</PosPart>
233234
<PosPart copyNumber="105">
234235
<rParent name="RP_210_Right_Station_Vacuum_3_Far"/>
235236
<rChild name="RP_Box_105:RP_box_primary_vacuum"/>
236237
<!-- <rRotation name="RP_Transformations:RP_z_180_rot"/> -->
237238
<rRotation name="RP_210_Right_180_minus_Sec_Rotation"/>
238-
<Translation x="0*mm" y="-[RP_Dist_Beam_Cent:RP_210_Right_Det_Dist_5]-[RP_Box:RP_Box_primary_vacuum_y]/2" z="[RP_210_Right_Sec_Vert_z]-[RP_210_Right_Station_Length]/2"/>
239+
<Translation x="(-[RP_Dist_Beam_Cent:RP_210_Right_Det_Dist_5]-[RP_Box:RP_Box_primary_vacuum_y]/2)*tan([RP_210_Right_Sec_Rot_Angle])" y="-[RP_Dist_Beam_Cent:RP_210_Right_Det_Dist_5]-[RP_Box:RP_Box_primary_vacuum_y]/2" z="[RP_210_Right_Sec_Vert_z]-[RP_210_Right_Station_Length]/2"/>
239240
</PosPart>
241+
240242
</PosPartSection>
241243
</DDDefinition>

0 commit comments

Comments
 (0)