Skip to content

Commit ef9b816

Browse files
simongesimonge
committed
Make constant names consistent
1 parent 2f9be18 commit ef9b816

File tree

10 files changed

+80
-80
lines changed

10 files changed

+80
-80
lines changed

‎compact/far_backward/beamline_extension_electron.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
type="BeamPipeChain"
1818
wall_thickness="2*mm">
1919
<pipe id="0" name="Pipe_in_Q3eR"
20-
xcenter="Q3eR_XPosition" zcenter="Q3eR_CenterPosition"
20+
xcenter="Q3eR_CenterX" zcenter="Q3eR_CenterZ"
2121
length="Q3eR_Length" theta="Q3eR_Theta"
2222
rout1="Q3eR_InnerRadius" rout2="Q3eR_InnerRadius">
2323
</pipe>

‎compact/far_backward/definitions.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@
1616

1717
<constant name="Q1eR_InnerRadius" value="67.5*mm"/>
1818
<constant name="Q1eR_Length" value="1.78*m"/>
19-
<constant name="Q1eR_CenterPosition" value="-6.2*m"/>
19+
<constant name="Q1eR_CenterZ" value="-6.2*m"/>
2020

2121
<constant name="Q2eR_InnerRadius" value="78.0*mm"/>
2222
<constant name="Q2eR_Length" value="1.4*m"/>
23-
<constant name="Q2eR_CenterPosition" value="-8.3*m"/>
23+
<constant name="Q2eR_CenterZ" value="-8.3*m"/>
2424

2525
<constant name="B2AeR_InnerRadius" value="90.0*mm"/>
2626
<constant name="B2AeR_Length" value="1.78*m"/>
27-
<constant name="B2AeR_CenterPosition" value="-10.5*m"/>
27+
<constant name="B2AeR_CenterZ" value="-10.5*m"/>
2828

2929
<constant name="B2BeR_InnerRadius" value="111.0*mm"/>
3030
<constant name="B2BeR_Length" value="3.18*m"/>
31-
<constant name="B2BeR_CenterX" value="0*mm"/>
32-
<constant name="B2BeR_CenterPosition" value="-13.275*m"/>
31+
<constant name="B2BeR_CenterX" value="0*mm"/>
32+
<constant name="B2BeR_CenterZ" value="-13.275*m"/>
3333
<constant name="B2BeR_Theta" value="0.0*rad"/>
3434

3535
<constant name="Q3eR_InnerRadius" value="0.05*m"/>
@@ -38,9 +38,9 @@
3838
<constant name="Q3eR_StartX" value="-0.460027*m"/>
3939
<constant name="Q3eR_EndZ" value="-38.295969*m"/>
4040
<constant name="Q3eR_EndX" value="-0.470873*m"/>
41-
<constant name="Q3eR_XPosition" value="-0.46545*m"/>
41+
<constant name="Q3eR_CenterZ" value="-37.996018*m"/>
42+
<constant name="Q3eR_CenterX" value="-0.46545*m"/>
4243
<constant name="Q3eR_Theta" value="0.0180766389*rad"/>
43-
<constant name="Q3eR_CenterPosition" value="-37.996018*m"/>
4444

4545
<comment> Note: Placements for Q4eR, B3eR, B4eR, B5eR, B6eR, B7eR
4646
are approximate (valid to within ~1 cm).
@@ -176,7 +176,7 @@
176176
<constant name="Vacuum_BB_MaxX" value="0.5*m"/>
177177
<constant name="Vacuum_BB_MinY" value="-1.5*m"/>
178178
<constant name="Vacuum_BB_MaxY" value="1.5*m"/>
179-
<constant name="Vacuum_BB_MinZ" value="B2BeR_CenterPosition-B2BeR_Length/2"/>
179+
<constant name="Vacuum_BB_MinZ" value="B2BeR_CenterZ- B2BeR_Length/2"/>
180180
<constant name="Vacuum_BB_MaxZ" value="Q3eR_EndZ"/>
181181

182182
<constant name="Beam_Theta" value="Q3eR_Theta"/>

‎compact/far_backward/magnets.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@
1414
wall_thickness="2*mm"
1515
vis="BeamPipeVis">
1616
<pipe id="0" name="Pipe_to_Q1eR"
17-
xcenter="0" zcenter="(Center_Beampipe_End + Q1eR_CenterPosition+Q1eR_Length/2)/2"
18-
length="Center_Beampipe_End - (Q1eR_CenterPosition+Q1eR_Length/2)" theta="0"
17+
xcenter="0" zcenter="(Center_Beampipe_End + Q1eR_CenterZ+Q1eR_Length/2)/2"
18+
length="Center_Beampipe_End - (Q1eR_CenterZ+Q1eR_Length/2)" theta="0"
1919
rout1="Center_Beampipe_Rad" rout2="Q1eR_InnerRadius">
2020
</pipe>
2121
<pipe id="1" name="Pipe_in_Q1eR"
22-
xcenter="0" zcenter="Q1eR_CenterPosition"
22+
xcenter="0" zcenter="Q1eR_CenterZ"
2323
length="Q1eR_Length" theta="0"
2424
rout1="Q1eR_InnerRadius" rout2="Q1eR_InnerRadius">
2525
</pipe>
2626
<pipe id="2" name="Pipe_Q1eR_to_Q2eR"/>
2727
<pipe id="3" name="Pipe_in_Q2eR"
28-
xcenter="0" zcenter="Q2eR_CenterPosition"
28+
xcenter="0" zcenter="Q2eR_CenterZ"
2929
length="Q2eR_Length" theta="0"
3030
rout1="Q2eR_InnerRadius" rout2="Q2eR_InnerRadius">
3131
</pipe>
3232
<pipe id="4" name="Pipe_Q2eR_to_B2AeR"/>
3333
<pipe id="5" name="Pipe_in_B2AeR"
34-
xcenter="0" zcenter="B2AeR_CenterPosition"
34+
xcenter="0" zcenter="B2AeR_CenterZ"
3535
length="B2AeR_Length" theta="0"
3636
rout1="B2AeR_InnerRadius" rout2="B2AeR_InnerRadius">
3737
</pipe>
3838
<pipe id="6" name="Pipe_B2AeR_to_B2BeR"/>
3939
<pipe id="7" name="Pipe_in_B2BeR"
40-
xcenter="B2BeR_CenterX" zcenter="B2BeR_CenterPosition"
40+
xcenter="B2BeR_CenterX" zcenter="B2BeR_CenterZ"
4141
length="B2BeR_Length" theta="B2BeR_Theta"
4242
rout1="B2BeR_InnerRadius" rout2="B2BeR_InnerRadius">
4343
</pipe>
@@ -46,28 +46,28 @@
4646
<comment> Electron side beam magnet volumes </comment>
4747

4848
<detector name="Magnet_Q1eR" type="ip6_CylindricalDipoleMagnet" vis="FFMagnetVis">
49-
<placement x="0" y="0" z="Q1eR_CenterPosition" theta="0*rad"/>
49+
<placement x="0" y="0" z="Q1eR_CenterZ" theta="0*rad"/>
5050
<dimensions x="Q1eR_InnerRadius*4" y="Q1eR_InnerRadius*4" z="Q1eR_Length" r="1.5*Q1eR_InnerRadius" />
5151
<apperture x="Q1eR_InnerRadius*2" y="Q1eR_InnerRadius*2" r="Q1eR_InnerRadius" />
5252
<coil dx="2*cm" dy="1.5*cm" /><!--unchecked-->
5353
</detector>
5454

5555
<detector name="Magnet_Q2eR" type="ip6_CylindricalDipoleMagnet" vis="FFMagnetVis">
56-
<placement x="0" y="0" z="Q2eR_CenterPosition" theta="0*rad"/>
56+
<placement x="0" y="0" z="Q2eR_CenterZ" theta="0*rad"/>
5757
<dimensions x="Q2eR_InnerRadius*4" y="Q2eR_InnerRadius*4" z="Q2eR_Length" r="1.5*Q2eR_InnerRadius"/>
5858
<apperture x="Q2eR_InnerRadius*2" y="Q2eR_InnerRadius*2" r="Q2eR_InnerRadius"/>
5959
<coil dx="2*cm" dy="1.5*cm" /><!--unchecked-->
6060
</detector>
6161

6262
<detector name="Magnet_B2AeR" type="ip6_CylindricalDipoleMagnet" vis="FFMagnetVis">
63-
<placement x="0" y="0" z="B2AeR_CenterPosition" theta="0*rad"/>
63+
<placement x="0" y="0" z="B2AeR_CenterZ" theta="0*rad"/>
6464
<dimensions x="B2AeR_InnerRadius*4" y="B2AeR_InnerRadius*4" z="B2AeR_Length" r="1.5*B2AeR_InnerRadius"/>
6565
<apperture x="B2AeR_InnerRadius*2" y="B2AeR_InnerRadius*2" r="B2AeR_InnerRadius"/>
6666
<coil dx="2*cm" dy="1.5*cm" /><!--unchecked-->
6767
</detector>
6868

6969
<detector name="Magnet_B2BeR" type="ip6_CylindricalDipoleMagnet" vis="FFMagnetVis">
70-
<placement x="B2BeR_CenterX" y="0" z="B2BeR_CenterPosition" theta="B2BeR_Theta"/>
70+
<placement x="B2BeR_CenterX" y="0" z="B2BeR_CenterZ" theta="B2BeR_Theta"/>
7171
<dimensions x="B2BeR_InnerRadius*4" y="B2BeR_InnerRadius*4" z="B2BeR_Length" r="1.5*B2BeR_InnerRadius"/>
7272
<apperture x="B2BeR_InnerRadius*2" y="B2BeR_InnerRadius*2" r="B2BeR_InnerRadius"/>
7373
<coil dx="2*cm" dy="1.5*cm" /><!--unchecked-->
@@ -78,7 +78,7 @@
7878
type="CylindricalMagnetChain"
7979
vis="FFMagnetVis">
8080
<magnet id="0" name="Magnet_Q3eR"
81-
x="Q3eR_XPosition" y="0" z="Q3eR_CenterPosition" theta="Q3eR_Theta"
81+
x="Q3eR_CenterX" y="0" z="Q3eR_CenterZ" theta="Q3eR_Theta"
8282
length="Q3eR_Length" rin="Q3eR_InnerRadius" rout="4*Q3eR_InnerRadius">
8383
</magnet>
8484
</detector>
@@ -91,35 +91,35 @@
9191

9292
<field name="Magnet_Q1eR_Field" type="MultipoleMagnet">
9393
<shape type="Tube" rmax="Q1eR_InnerRadius" dz="Q1eR_Length/2"/>
94-
<position x="0" y="0" z="Q1eR_CenterPosition"/>
94+
<position x="0" y="0" z="Q1eR_CenterZ"/>
9595
<coefficient/>
9696
<coefficient coefficient="Q1eR_Gradient"/>
9797
</field>
9898

9999
<field name="Magnet_Q2eR_Field" type="MultipoleMagnet">
100100
<shape type="Tube" rmax="Q2eR_InnerRadius" dz="Q2eR_Length/2"/>
101-
<position x="0" y="0" z="Q2eR_CenterPosition"/>
101+
<position x="0" y="0" z="Q2eR_CenterZ"/>
102102
<coefficient/>
103103
<coefficient coefficient="Q2eR_Gradient"/>
104104
</field>
105105

106106
<field name="Magnet_Q3eR_Field" type="MultipoleMagnet">
107107
<shape type="Tube" rmax="Q3eR_InnerRadius" dz="Q3eR_Length/2"/>
108-
<position x="Q3eR_XPosition" y="0" z="Q3eR_CenterPosition"/>
108+
<position x="Q3eR_CenterX" y="0" z="Q3eR_CenterZ"/>
109109
<rotation x="0" y="Q3eR_Theta" z="0"/>
110110
<coefficient/>
111111
<coefficient coefficient="Q3eR_Gradient"/>
112112
</field>
113113

114114
<field name="Magnet_B2AeR_Field" type="MultipoleMagnet">
115115
<shape type="Tube" rmax="B2AeR_InnerRadius" dz="B2AeR_Length/2"/>
116-
<position x="0" y="0" z="B2AeR_CenterPosition"/>
116+
<position x="0" y="0" z="B2AeR_CenterZ"/>
117117
<coefficient coefficient="B2AeR_B"/>
118118
</field>
119119

120120
<field name="Magnet_B2BeR_Field" type="MultipoleMagnet">
121121
<shape type="Tube" rmax="B2BeR_InnerRadius" dz="B2BeR_Length/2"/>
122-
<position x="0" y="0" z="B2BeR_CenterPosition"/>
122+
<position x="0" y="0" z="B2BeR_CenterZ"/>
123123
<coefficient coefficient="B2BeR_B"/>
124124
</field>
125125

‎compact/far_forward/beampipe_hadron_B0.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
<detectors>
1212

1313
<detector id="BeamPipeB0_ID" name="BeamPipeB0" type="forwardBeamPipeBrazil" vis="BeamPipeVis">
14-
<position x="-0.165*m" y="0*m" z="B0PF_CenterPosition" />
14+
<position x="-0.165*m" y="0*m" z="B0PF_CenterZ" />
1515
<rotation x="0*rad" y="0*rad" z="0*rad" />
1616
</detector>
1717

1818
<detector id="B0Window_ID" name="B0Window" type="B0Window" material="StainlessSteelP506" vis="AnlLightGray">
1919
<dimensions r="B0PF_InnerRadius" z="B0Win_thickness" x="1.9*Q0EF_InnerRadius" y="Beampipe_rmax" />
20-
<position x="B0PF_XPosition" y="0" z="B0PF_CenterPosition-B0PF_Length/2.0+B0Win_thickness" />
20+
<position x="B0PF_CenterX" y="0" z="B0PF_CenterZ-B0PF_Length/2.0+B0Win_thickness" />
2121
<rotation x="0*rad" y="0*rad" z="0*rad" />
2222
</detector>
2323
</detectors>

‎compact/far_forward/definitions.xml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -66,31 +66,31 @@
6666
<constant name="Q2PF_RotationAngle" value="-14.8*0.001*rad"/>
6767
<constant name="B1PF_RotationAngle" value="-34.0*0.001*rad"/>
6868
<constant name="B1APF_RotationAngle" value="-25.0*0.001*rad"/>
69-
<constant name="B2PF_RotationAngle" value="-28.22*0.001*rad"/>
70-
<constant name="Q0EF_RotationAngle" value="-0.0*rad"/>
69+
<constant name="B2PF_RotationAngle" value="-28.22*0.001*rad"/>
70+
<constant name="Q0EF_RotationAngle" value="-0.0*rad"/>
7171
<constant name="Q1EF_RotationAngle" value="-0.0*rad"/>
7272

73-
<constant name="B0PF_CenterPosition" value="6.4*m"/>
74-
<constant name="B0APF_CenterPosition" value="8.198946015*m"/>
75-
<constant name="Q1APF_CenterPosition" value="9.628296939*m"/>
76-
<constant name="Q1BPF_CenterPosition" value="11.56243847*m"/>
77-
<constant name="Q2PF_CenterPosition" value="14.66604545*m"/>
78-
<constant name="B1PF_CenterPosition" value="18.56486896*m"/>
79-
<constant name="B1APF_CenterPosition" value="21.31298439*m"/>
80-
<constant name="B2PF_CenterPosition" value="40.74293743*m"/>
81-
<constant name="Q0EF_CenterPosition" value="5.8*m"/>
82-
<constant name="Q1EF_CenterPosition" value="10.76*m"/>
83-
84-
<constant name="B0PF_XPosition" value="-0.145779265*m"/>
85-
<constant name="B0APF_XPosition" value="-0.210480535*m"/>
86-
<constant name="Q1APF_XPosition" value="-0.254342857*m"/>
87-
<constant name="Q1BPF_XPosition" value="-0.312840809*m"/>
88-
<constant name="Q2PF_XPosition" value="-0.407362293*m"/>
89-
<constant name="B1PF_XPosition" value="-0.503165042*m"/>
90-
<constant name="B1APF_XPosition" value="-0.612903791*m"/>
91-
<constant name="B2PF_XPosition" value="-1.491239596*m"/>
92-
<constant name="Q0EF_XPosition" value="-0.0*m"/>
93-
<constant name="Q1EF_XPosition" value="-0.0*m"/>
73+
<constant name="B0PF_CenterZ" value="6.4*m"/>
74+
<constant name="B0APF_CenterZ" value="8.198946015*m"/>
75+
<constant name="Q1APF_CenterZ" value="9.628296939*m"/>
76+
<constant name="Q1BPF_CenterZ" value="11.56243847*m"/>
77+
<constant name="Q2PF_CenterZ" value="14.66604545*m"/>
78+
<constant name="B1PF_CenterZ" value="18.56486896*m"/>
79+
<constant name="B1APF_CenterZ" value="21.31298439*m"/>
80+
<constant name="B2PF_CenterZ" value="40.74293743*m"/>
81+
<constant name="Q0EF_CenterZ" value="5.8*m"/>
82+
<constant name="Q1EF_CenterZ" value="10.76*m"/>
83+
84+
<constant name="B0PF_CenterX" value="-0.145779265*m"/>
85+
<constant name="B0APF_CenterX" value="-0.210480535*m"/>
86+
<constant name="Q1APF_CenterX" value="-0.254342857*m"/>
87+
<constant name="Q1BPF_CenterX" value="-0.312840809*m"/>
88+
<constant name="Q2PF_CenterX" value="-0.407362293*m"/>
89+
<constant name="B1PF_CenterX" value="-0.503165042*m"/>
90+
<constant name="B1APF_CenterX" value="-0.612903791*m"/>
91+
<constant name="B2PF_CenterX" value="-1.491239596*m"/>
92+
<constant name="Q0EF_CenterX" value="-0.0*m"/>
93+
<constant name="Q1EF_CenterX" value="-0.0*m"/>
9494

9595
<constant name="B0PF_Length" value="1.2*m"/>
9696
<constant name="B0APF_Length" value="0.6*m"/>

‎compact/far_forward/ion_beamline.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,49 +22,49 @@
2222
</comment>
2323
<detectors>
2424
<detector id="B0PF_ID" name="B0PF_BeamlineMagnet" vis="FFMagnetVis" type="ip6_CylindricalDipoleMagnet">
25-
<placement x="B0PF_XPosition" y="0*m" z="B0PF_CenterPosition" theta="B0PF_RotationAngle" />
25+
<placement x="B0PF_CenterX" y="0*m" z="B0PF_CenterZ" theta="B0PF_RotationAngle" />
2626
<dimensions x="B0PF_InnerRadius*4" y="B0PF_InnerRadius*4" z="B0PF_Length" r="B0PF_InnerRadius*2.0" />
2727
<apperture x="B0PF_InnerRadius" y="B0PF_InnerRadius" r="B0PF_InnerRadius" />
2828
<coil vis="FFMagnetCoilVis" dx="2*cm" dy="1.5*cm" />
2929
</detector>
3030
<detector id="B0APF_ID" name="B0APF_BeamlineMagnet" vis="FFMagnetVis" type="ip6_CylindricalDipoleMagnet">
31-
<placement x="B0APF_XPosition" y="0*m" z="B0APF_CenterPosition" theta="B0APF_RotationAngle" />
31+
<placement x="B0APF_CenterX" y="0*m" z="B0APF_CenterZ" theta="B0APF_RotationAngle" />
3232
<dimensions x="B0APF_InnerRadius*4" y="B0APF_InnerRadius*4" z="B0APF_Length" r="B0APF_InnerRadius*2.0" />
3333
<apperture x="B0APF_InnerRadius" y="B0APF_InnerRadius" r="B0APF_InnerRadius" />
3434
<coil vis="FFMagnetCoilVis" dx="2*cm" dy="1.5*cm" />
3535
</detector>
3636
<detector id="Q1APF_ID" name="Q1APF_BeamlineMagnet" vis="FFMagnetVis" type="ip6_CylindricalDipoleMagnet">
37-
<placement x="Q1APF_XPosition" y="0*m" z="Q1APF_CenterPosition" theta="Q1APF_RotationAngle" />
37+
<placement x="Q1APF_CenterX" y="0*m" z="Q1APF_CenterZ" theta="Q1APF_RotationAngle" />
3838
<dimensions x="Q1APF_InnerRadius*4" y="Q1APF_InnerRadius*4" z="Q1APF_Length" r="2.0*Q1APF_InnerRadius"/>
3939
<apperture x="Q1APF_InnerRadius*2" y="Q1APF_InnerRadius*2" r="Q1APF_InnerRadius"/>
4040
<coil vis="FFMagnetCoilVis" dx="2*cm" dy="1.5*cm" />
4141
</detector>
4242
<detector id="Q1BPF_ID" name="Q1BPF_BeamlineMagnet" vis="FFMagnetVis" type="ip6_CylindricalDipoleMagnet">
43-
<placement x="Q1BPF_XPosition" y="0*m" z="Q1BPF_CenterPosition" theta="Q1BPF_RotationAngle" />
43+
<placement x="Q1BPF_CenterX" y="0*m" z="Q1BPF_CenterZ" theta="Q1BPF_RotationAngle" />
4444
<dimensions x="Q1BPF_InnerRadius*4" y="Q1BPF_InnerRadius*4" z="Q1BPF_Length" r="2.0*Q1BPF_InnerRadius"/>
4545
<apperture x="Q1BPF_InnerRadius*2" y="Q1BPF_InnerRadius*2" r="Q1BPF_InnerRadius"/>
4646
<coil vis="FFMagnetCoilVis" dx="1*cm" dy="0.5*cm" />
4747
</detector>
4848
<detector id="Q2PF_ID" name="Q2PF_BeamlineMagnet" vis="FFMagnetVis" type="ip6_CylindricalDipoleMagnet">
49-
<placement x="Q2PF_XPosition" y="0*m" z="Q2PF_CenterPosition" theta="Q2PF_RotationAngle" />
49+
<placement x="Q2PF_CenterX" y="0*m" z="Q2PF_CenterZ" theta="Q2PF_RotationAngle" />
5050
<dimensions x="Q2PF_InnerRadius*4" y="Q2PF_InnerRadius*4" z="Q2PF_Length" r="2.0*Q2PF_InnerRadius" />
5151
<apperture x="Q2PF_InnerRadius*2" y="Q2PF_InnerRadius*2" r="Q2PF_InnerRadius"/>
5252
<coil vis="FFMagnetCoilVis" dx="1*cm" dy="0.5*cm" />
5353
</detector>
5454
<detector id="B1PF_ID" name="B1PF_BeamlineMagnet" vis="FFMagnetVis" type="ip6_CylindricalDipoleMagnet">
55-
<placement x="B1PF_XPosition" y="0*m" z="B1PF_CenterPosition" theta="B1PF_RotationAngle" />
55+
<placement x="B1PF_CenterX" y="0*m" z="B1PF_CenterZ" theta="B1PF_RotationAngle" />
5656
<dimensions x="B1PF_InnerRadius*4" y="B1PF_InnerRadius*4" z="B1PF_Length" r="2.0*B1PF_InnerRadius" />
5757
<apperture x="B1PF_InnerRadius*2" y="B1PF_InnerRadius*2" r="B1PF_InnerRadius" />
5858
<coil vis="FFMagnetCoilVis" dx="1*cm" dy="0.5*cm" />
5959
</detector>
6060
<detector id="B1APF_ID" name="B1APF_BeamlineMagnet" vis="FFMagnetVis" type="ip6_CylindricalDipoleMagnet">
61-
<placement x="B1APF_XPosition" y="0*m" z="B1APF_CenterPosition" theta="B1APF_RotationAngle" />
61+
<placement x="B1APF_CenterX" y="0*m" z="B1APF_CenterZ" theta="B1APF_RotationAngle" />
6262
<dimensions x="B1APF_InnerRadius*4" y="B1APF_InnerRadius*4" z="B1APF_Length" r="2.0*B1APF_InnerRadius" />
6363
<apperture x="B1APF_InnerRadius*2" y="B1APF_InnerRadius*2" r="B1APF_InnerRadius"/>
6464
<coil vis="FFMagnetCoilVis" dx="1*cm" dy="0.5*cm" />
6565
</detector>
6666
<detector id="B2PF_ID" name="B2PF_BeamlineMagnet" vis="FFMagnetVis" type="ip6_CylindricalDipoleMagnet">
67-
<placement x="B2PF_XPosition" y="0*m" z="B2PF_CenterPosition" theta="B2PF_RotationAngle" />
67+
<placement x="B2PF_CenterX" y="0*m" z="B2PF_CenterZ" theta="B2PF_RotationAngle" />
6868
<dimensions x="B2PF_InnerRadius*4" y="B2PF_InnerRadius*4" z="B2PF_Length" r="2.0*B2PF_InnerRadius" />
6969
<apperture x="B2PF_InnerRadius*2" y="B2PF_InnerRadius*2" r="B2PF_InnerRadius"/>
7070
<coil vis="FFMagnetCoilVis" dx="1*cm" dy="0.5*cm" />

0 commit comments

Comments
 (0)