From e303623b4a7cc4703f0bff82a6dc611ef2575ae2 Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Thu, 21 Oct 2021 20:22:36 +0000
Subject: [PATCH] Resolve "Move downstream beam pipe flange"

---
 ip6/beampipe.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/ip6/beampipe.xml b/ip6/beampipe.xml
index 625724a..f3fe02c 100644
--- a/ip6/beampipe.xml
+++ b/ip6/beampipe.xml
@@ -59,14 +59,12 @@
                          crossing_angle="CrossingAngle">
           <!-- avoid overlap with IP beampipe by starting slightly displaced -->
           <zplane z="BeampipeDownstreamStraightLength + 0.5 * BeampipeOD * tan(abs(CrossingAngle))" OD="BeampipeOD"/>
-          <!-- FIXME avoid overlap with TrackerEndcapP_Outer_layer3 by moving flange 40 mm in z -->
-          <!-- FIXME avoid overlap with TrackerEndcapP_Outer_layer3 by changing OD -->
-          <zplane z="1240.00 * mm" OD=" 92.06 * mm - 1.0 * mm"/>
-          <zplane z="1240.01 * mm" OD=" 92.06 * mm + 2.0 * BeampipeDownstreamFlange1Thickness"
+          <zplane z="1780.00 * mm" OD=" 92.06 * mm - 1.0 * mm"/>
+          <zplane z="1780.01 * mm" OD=" 92.06 * mm + 2.0 * BeampipeDownstreamFlange1Thickness"
                   extra_thickness="BeampipeDownstreamFlange1Thickness"/>
-          <zplane z="1280.00 * mm" OD=" 92.06 * mm + 2.0 * BeampipeDownstreamFlange1Thickness"
+          <zplane z="1820.00 * mm" OD=" 92.06 * mm + 2.0 * BeampipeDownstreamFlange1Thickness"
                   extra_thickness="BeampipeDownstreamFlange1Thickness"/>
-          <zplane z="1280.01 * mm" OD=" 92.06 * mm"/>
+          <zplane z="1820.01 * mm" OD=" 92.06 * mm"/>
           <zplane z="4455.80 * mm" OD="257.92 * mm"/>
           <zplane z="4455.81 * mm" OD="257.92 * mm + 2.0 * BeampipeDownstreamFlange2Thickness"
                   extra_thickness="BeampipeDownstreamFlange2Thickness"/>
-- 
GitLab