diff --git a/eic/forward_ion_beamline.xml b/eic/forward_ion_beamline.xml
index c8215c3888d66bf7328683fcbdd3d94f9561604a..0cb157b4d153db73929fa393d5b191fe3f18c4a0 100644
--- a/eic/forward_ion_beamline.xml
+++ b/eic/forward_ion_beamline.xml
@@ -3,100 +3,111 @@
<define>
</define>
+ <comment>
+ =====================================
+ (170-189) Forward Beamline Magnets
+ =====================================
+ </comment>
+
+ <comment>
+ =====================================
+ (190-199) Backward Beamline Magnets
+ =====================================
+ </comment>
<detectors>
- <detector id="63" name="B0PF_BeamlineMagnet" type="B0pFMag">
+ <detector id="170" name="B0PF_BeamlineMagnet" type="B0pFMag">
<placement x="B0PF_XPosition" y="0*m" z="B0PF_CenterPosition" theta="B0PF_RotationAngle" />
<dimensions x="1.4*m" y="0.8*m" z="B0PF_Length" />
<apperture x="0.5*m" y="0.2*m" />
<coil dx="0.08*m" dy="0.02*m" />
</detector>
- <detector id="64" name="B0APF_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
+ <detector id="171" name="B0APF_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
<placement x="B0APF_XPosition" y="0*m" z="B0APF_CenterPosition" theta="B0APF_RotationAngle" />
<dimensions x="B0APF_InnerRadius*4" y="B0APF_InnerRadius*4" z="B0APF_Length" r="B0APF_InnerRadius*2.0" />
<apperture x="B0APF_InnerRadius" y="B0APF_InnerRadius" r="B0APF_InnerRadius" />
<coil dx="2*cm" dy="1.5*cm" />
</detector>
- <detector id="65" name="Q1APF_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
+ <detector id="172" name="Q1APF_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
<placement x="Q1APF_XPosition" y="0*m" z="Q1APF_CenterPosition" theta="Q1APF_RotationAngle" />
<dimensions x="Q1APF_InnerRadius*4" y="Q1APF_InnerRadius*4" z="Q1APF_Length" r="2.0*Q1APF_InnerRadius"/>
<apperture x="Q1APF_InnerRadius*2" y="Q1APF_InnerRadius*2" r="Q1APF_InnerRadius"/>
<coil dx="2*cm" dy="1.5*cm" />
</detector>
- <detector id="66" name="Q1BPF_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
+ <detector id="173" name="Q1BPF_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
<placement x="Q1BPF_XPosition" y="0*m" z="Q1BPF_CenterPosition" theta="Q1BPF_RotationAngle" />
<dimensions x="Q1BPF_InnerRadius*4" y="Q1BPF_InnerRadius*4" z="Q1BPF_Length" r="2.0*Q1BPF_InnerRadius"/>
<apperture x="Q1BPF_InnerRadius*2" y="Q1BPF_InnerRadius*2" r="Q1BPF_InnerRadius"/>
<coil dx="1*cm" dy="0.5*cm" />
</detector>
- <detector id="67" name="Q2PF_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
+ <detector id="174" name="Q2PF_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
<placement x="Q2PF_XPosition" y="0*m" z="Q2PF_CenterPosition" theta="Q2PF_RotationAngle" />
<dimensions x="Q2PF_InnerRadius*4" y="Q2PF_InnerRadius*4" z="Q2PF_Length" r="2.0*Q2PF_InnerRadius" />
<apperture x="Q2PF_InnerRadius*2" y="Q2PF_InnerRadius*2" r="Q2PF_InnerRadius"/>
<coil dx="1*cm" dy="0.5*cm" />
</detector>
- <detector id="68" name="B1PF_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
+ <detector id="175" name="B1PF_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
<placement x="B1PF_XPosition" y="0*m" z="B1PF_CenterPosition" theta="B1PF_RotationAngle" />
<dimensions x="B1PF_InnerRadius*4" y="B1PF_InnerRadius*4" z="B1PF_Length" r="2.0*B1PF_InnerRadius" />
<apperture x="B1PF_InnerRadius*2" y="B1PF_InnerRadius*2" r="B1PF_InnerRadius" />
<coil dx="1*cm" dy="0.5*cm" />
</detector>
- <detector id="69" name="B1APF_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
+ <detector id="176" name="B1APF_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
<placement x="B1APF_XPosition" y="0*m" z="B1APF_CenterPosition" theta="B1APF_RotationAngle" />
<dimensions x="B1APF_InnerRadius*4" y="B1APF_InnerRadius*4" z="B1APF_Length" r="2.0*B1APF_InnerRadius" />
<apperture x="B1APF_InnerRadius*2" y="B1APF_InnerRadius*2" r="B1APF_InnerRadius"/>
<coil dx="1*cm" dy="0.5*cm" />
</detector>
- <detector id="70" name="B2PF_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
+ <detector id="177" name="B2PF_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
<placement x="B2PF_XPosition" y="0*m" z="B2PF_CenterPosition" theta="B2PF_RotationAngle" />
<dimensions x="B2PF_InnerRadius*4" y="B2PF_InnerRadius*4" z="B2PF_Length" r="2.0*B2PF_InnerRadius" />
<apperture x="B2PF_InnerRadius*2" y="B2PF_InnerRadius*2" r="B2PF_InnerRadius"/>
<coil dx="1*cm" dy="0.5*cm" />
</detector>
- <detector id="71" name="QPFC1_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
+ <detector id="178" name="QPFC1_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
<placement x="QPFC1_XPosition" y="0*m" z="QPFC1_CenterPosition" theta="QPFC1_RotationAngle" />
<dimensions x="QPFC1_InnerRadius*4" y="QPFC1_InnerRadius*4" z="QPFC1_Length" r="2.0*QPFC1_InnerRadius"/>
<apperture x="QPFC1_InnerRadius*2" y="QPFC1_InnerRadius*2" r="QPFC1_InnerRadius"/>
<coil dx="1*cm" dy="0.5*cm" />
</detector>
- <detector id="72" name="QPFC2_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
+ <detector id="179" name="QPFC2_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
<placement x="QPFC2_XPosition" y="0*m" z="QPFC2_CenterPosition" theta="QPFC2_RotationAngle" />
<dimensions x="QPFC2_InnerRadius*4" y="QPFC2_InnerRadius*4" z="QPFC2_Length" r="2.0*QPFC2_InnerRadius"/>
<apperture x="QPFC2_InnerRadius*2" y="QPFC2_InnerRadius*2" r="QPFC2_InnerRadius"/>
<coil dx="1*cm" dy="0.5*cm" />
</detector>
<!--
- <detector id="73" name="crab_example" vis="RedVis" type="CrabCavity">
+ <detector id="180" name="crab_example" vis="RedVis" type="CrabCavity">
<placement x="CCPF_XPosition" y="0*m" z="CCPF_CenterPosition" theta="0.0" />
<dimensions r="1.2*m" z="2*m" />
<apperture r="0.2*m" />
<cavity r1="1*m" r2="0.5*m" z1="1.2*m" z2="0.4*m" />
</detector>
-->
- <detector id="74" name="QPFC3_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
+ <detector id="181" name="QPFC3_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
<placement x="QPFC3_XPosition" y="0*m" z="QPFC3_CenterPosition" theta="QPFC3_RotationAngle" />
<dimensions x="QPFC3_InnerRadius*4" y="QPFC3_InnerRadius*4" z="QPFC3_Length" r="2.0*QPFC3_InnerRadius"/>
<apperture x="QPFC3_InnerRadius*2" y="QPFC3_InnerRadius*2" r="QPFC3_InnerRadius"/>
<coil dx="1*cm" dy="0.5*cm" />
</detector>
- <detector id="75" name="QPFC4_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
+ <detector id="182" name="QPFC4_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
<placement x="QPFC4_XPosition" y="0*m" z="QPFC4_CenterPosition" theta="QPFC4_RotationAngle" />
<dimensions x="QPFC4_InnerRadius*4" y="QPFC4_InnerRadius*4" z="QPFC4_Length" r="2.0*QPFC4_InnerRadius"/>
<apperture x="QPFC4_InnerRadius*2" y="QPFC4_InnerRadius*2" r="QPFC4_InnerRadius"/>
<coil dx="1*cm" dy="0.5*cm" />
</detector>
- <detector id="76" name="QPFR1_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
+ <detector id="183" name="QPFR1_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
<placement x="QPFR1_XPosition" y="0*m" z="QPFR1_CenterPosition" theta="QPFR1_RotationAngle" />
<dimensions x="QPFR1_InnerRadius*4" y="QPFR1_InnerRadius*4" z="QPFR1_Length" r="2.0*QPFR1_InnerRadius"/>
<apperture x="QPFR1_InnerRadius*2" y="QPFR1_InnerRadius*2" r="QPFR1_InnerRadius"/>
<coil dx="1*cm" dy="0.5*cm" />
</detector>
- <detector id="77" name="BPFR1_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
+ <detector id="184" name="BPFR1_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
<placement x="BPFR1_XPosition" y="0*m" z="BPFR1_CenterPosition" theta="BPFR1_RotationAngle" />
<dimensions x="BPFR1_InnerRadius*4" y="BPFR1_InnerRadius*4" z="BPFR1_Length" r="2.0*BPFR1_InnerRadius" />
<apperture x="BPFR1_InnerRadius*2" y="BPFR1_InnerRadius*2" r="BPFR1_InnerRadius"/>
<coil dx="1*cm" dy="0.5*cm" />
</detector>
- <detector id="78" name="QPFR2_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
+ <detector id="185" name="QPFR2_BeamlineMagnet" vis="RedVis" type="CylindricalDipoleMagnet">
<placement x="QPFR2_XPosition" y="0*m" z="QPFR2_CenterPosition" theta="QPFR2_RotationAngle" />
<dimensions x="QPFR2_InnerRadius*4" y="QPFR2_InnerRadius*4" z="QPFR2_Length" r="2.0*QPFR2_InnerRadius"/>
<apperture x="QPFR2_InnerRadius*2" y="QPFR2_InnerRadius*2" r="QPFR2_InnerRadius"/>