Skip to content

Commit 3f751bf

Browse files
simongesimonge
committed
Merge branch 'Setup-new-far-backwards-geoemtry' of github.com:eic/epic into Setup-new-far-backwards-geoemtry
2 parents b809a4d + 1b184c5 commit 3f751bf

24 files changed

+64
-64
lines changed

‎compact/fields/beamline_10x100.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<constant name="ElectronBeamEnergy" value="10*GeV" />
77
<constant name="IonBeamEnergy" value="100*GeV" />
8-
8+
99
<constant name="ReferenceElectronEnergy" value="18*GeV" /> <!-- Reference energy for field strengths in beamline_constants.xml -->
1010

1111
<constant name="FieldScaleFactor" value="1.0" /> <!-- only use for 275 GeV magnet config ::: ASK FF EXPERTS -->
@@ -19,7 +19,7 @@
1919
<xi:include href="beamline_constants.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
2020

2121
<!-- Scale reference field strengths by beam energy ratio -->
22-
22+
2323
<!-- Quadrupole gradients scaled to beam energy -->
2424
<constant name="Q1eR_Gradient" value="Q1eR_Gradient_perGeV * ElectronBeamEnergy"/>
2525
<constant name="Q2eR_Gradient" value="Q2eR_Gradient_perGeV * ElectronBeamEnergy"/>
@@ -39,7 +39,7 @@
3939
<constant name="Q11eR_Gradient" value="Q11eR_Gradient_perGeV * ElectronBeamEnergy"/>
4040
<constant name="Q12eR_Gradient" value="Q12eR_Gradient_perGeV * ElectronBeamEnergy"/>
4141
<constant name="Q13eR_Gradient" value="Q13eR_Gradient_perGeV * ElectronBeamEnergy"/>
42-
42+
4343
<!-- Dipole fields scaled to beam energy -->
4444
<constant name="B2AeR_B" value="B2AeR_B_perGeV * ElectronBeamEnergy"/>
4545
<constant name="B2BeR_B" value="B2BeR_B_perGeV * ElectronBeamEnergy"/>

‎compact/fields/beamline_10x100_Au197.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<xi:include href="beamline_constants.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
1818

1919
<!-- Scale reference field strengths by beam energy ratio -->
20-
20+
2121
<!-- Quadrupole gradients scaled to beam energy -->
2222
<constant name="Q1eR_Gradient" value="Q1eR_Gradient_perGeV * ElectronBeamEnergy"/>
2323
<constant name="Q2eR_Gradient" value="Q2eR_Gradient_perGeV * ElectronBeamEnergy"/>
@@ -37,7 +37,7 @@
3737
<constant name="Q11eR_Gradient" value="Q11eR_Gradient_perGeV * ElectronBeamEnergy"/>
3838
<constant name="Q12eR_Gradient" value="Q12eR_Gradient_perGeV * ElectronBeamEnergy"/>
3939
<constant name="Q13eR_Gradient" value="Q13eR_Gradient_perGeV * ElectronBeamEnergy"/>
40-
40+
4141
<!-- Dipole fields scaled to beam energy -->
4242
<constant name="B2AeR_B" value="B2AeR_B_perGeV * ElectronBeamEnergy"/>
4343
<constant name="B2BeR_B" value="B2BeR_B_perGeV * ElectronBeamEnergy"/>

‎compact/fields/beamline_10x110_H2.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<xi:include href="beamline_constants.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
1818

1919
<!-- Scale reference field strengths by beam energy ratio -->
20-
20+
2121
<!-- Quadrupole gradients scaled to beam energy -->
2222
<constant name="Q1eR_Gradient" value="Q1eR_Gradient_perGeV * ElectronBeamEnergy"/>
2323
<constant name="Q2eR_Gradient" value="Q2eR_Gradient_perGeV * ElectronBeamEnergy"/>
@@ -37,7 +37,7 @@
3737
<constant name="Q11eR_Gradient" value="Q11eR_Gradient_perGeV * ElectronBeamEnergy"/>
3838
<constant name="Q12eR_Gradient" value="Q12eR_Gradient_perGeV * ElectronBeamEnergy"/>
3939
<constant name="Q13eR_Gradient" value="Q13eR_Gradient_perGeV * ElectronBeamEnergy"/>
40-
40+
4141
<!-- Dipole fields scaled to beam energy -->
4242
<constant name="B2AeR_B" value="B2AeR_B_perGeV * ElectronBeamEnergy"/>
4343
<constant name="B2BeR_B" value="B2BeR_B_perGeV * ElectronBeamEnergy"/>

‎compact/fields/beamline_10x110_He3.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<xi:include href="beamline_constants.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
1818

1919
<!-- Scale reference field strengths by beam energy ratio -->
20-
20+
2121
<!-- Quadrupole gradients scaled to beam energy -->
2222
<constant name="Q1eR_Gradient" value="Q1eR_Gradient_perGeV * ElectronBeamEnergy"/>
2323
<constant name="Q2eR_Gradient" value="Q2eR_Gradient_perGeV * ElectronBeamEnergy"/>
@@ -37,7 +37,7 @@
3737
<constant name="Q11eR_Gradient" value="Q11eR_Gradient_perGeV * ElectronBeamEnergy"/>
3838
<constant name="Q12eR_Gradient" value="Q12eR_Gradient_perGeV * ElectronBeamEnergy"/>
3939
<constant name="Q13eR_Gradient" value="Q13eR_Gradient_perGeV * ElectronBeamEnergy"/>
40-
40+
4141
<!-- Dipole fields scaled to beam energy -->
4242
<constant name="B2AeR_B" value="B2AeR_B_perGeV * ElectronBeamEnergy"/>
4343
<constant name="B2BeR_B" value="B2BeR_B_perGeV * ElectronBeamEnergy"/>

‎compact/fields/beamline_10x115_Cu63.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<xi:include href="beamline_constants.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
1818

1919
<!-- Scale reference field strengths by beam energy ratio -->
20-
20+
2121
<!-- Quadrupole gradients scaled to beam energy -->
2222
<constant name="Q1eR_Gradient" value="Q1eR_Gradient_perGeV * ElectronBeamEnergy"/>
2323
<constant name="Q2eR_Gradient" value="Q2eR_Gradient_perGeV * ElectronBeamEnergy"/>
@@ -37,7 +37,7 @@
3737
<constant name="Q11eR_Gradient" value="Q11eR_Gradient_perGeV * ElectronBeamEnergy"/>
3838
<constant name="Q12eR_Gradient" value="Q12eR_Gradient_perGeV * ElectronBeamEnergy"/>
3939
<constant name="Q13eR_Gradient" value="Q13eR_Gradient_perGeV * ElectronBeamEnergy"/>
40-
40+
4141
<!-- Dipole fields scaled to beam energy -->
4242
<constant name="B2AeR_B" value="B2AeR_B_perGeV * ElectronBeamEnergy"/>
4343
<constant name="B2BeR_B" value="B2BeR_B_perGeV * ElectronBeamEnergy"/>

‎compact/fields/beamline_10x115_Ru96.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<xi:include href="beamline_constants.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
1818

1919
<!-- Scale reference field strengths by beam energy ratio -->
20-
20+
2121
<!-- Quadrupole gradients scaled to beam energy -->
2222
<constant name="Q1eR_Gradient" value="Q1eR_Gradient_perGeV * ElectronBeamEnergy"/>
2323
<constant name="Q2eR_Gradient" value="Q2eR_Gradient_perGeV * ElectronBeamEnergy"/>
@@ -37,7 +37,7 @@
3737
<constant name="Q11eR_Gradient" value="Q11eR_Gradient_perGeV * ElectronBeamEnergy"/>
3838
<constant name="Q12eR_Gradient" value="Q12eR_Gradient_perGeV * ElectronBeamEnergy"/>
3939
<constant name="Q13eR_Gradient" value="Q13eR_Gradient_perGeV * ElectronBeamEnergy"/>
40-
40+
4141
<!-- Dipole fields scaled to beam energy -->
4242
<constant name="B2AeR_B" value="B2AeR_B_perGeV * ElectronBeamEnergy"/>
4343
<constant name="B2BeR_B" value="B2BeR_B_perGeV * ElectronBeamEnergy"/>

‎compact/fields/beamline_10x130.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<xi:include href="beamline_constants.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
1818

1919
<!-- Scale reference field strengths by beam energy ratio -->
20-
20+
2121
<!-- Quadrupole gradients scaled to beam energy -->
2222
<constant name="Q1eR_Gradient" value="Q1eR_Gradient_perGeV * ElectronBeamEnergy"/>
2323
<constant name="Q2eR_Gradient" value="Q2eR_Gradient_perGeV * ElectronBeamEnergy"/>
@@ -37,7 +37,7 @@
3737
<constant name="Q11eR_Gradient" value="Q11eR_Gradient_perGeV * ElectronBeamEnergy"/>
3838
<constant name="Q12eR_Gradient" value="Q12eR_Gradient_perGeV * ElectronBeamEnergy"/>
3939
<constant name="Q13eR_Gradient" value="Q13eR_Gradient_perGeV * ElectronBeamEnergy"/>
40-
40+
4141
<!-- Dipole fields scaled to beam energy -->
4242
<constant name="B2AeR_B" value="B2AeR_B_perGeV * ElectronBeamEnergy"/>
4343
<constant name="B2BeR_B" value="B2BeR_B_perGeV * ElectronBeamEnergy"/>

‎compact/fields/beamline_10x130_H2.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<xi:include href="beamline_constants.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
1818

1919
<!-- Scale reference field strengths by beam energy ratio -->
20-
20+
2121
<!-- Quadrupole gradients scaled to beam energy -->
2222
<constant name="Q1eR_Gradient" value="Q1eR_Gradient_perGeV * ElectronBeamEnergy"/>
2323
<constant name="Q2eR_Gradient" value="Q2eR_Gradient_perGeV * ElectronBeamEnergy"/>
@@ -37,7 +37,7 @@
3737
<constant name="Q11eR_Gradient" value="Q11eR_Gradient_perGeV * ElectronBeamEnergy"/>
3838
<constant name="Q12eR_Gradient" value="Q12eR_Gradient_perGeV * ElectronBeamEnergy"/>
3939
<constant name="Q13eR_Gradient" value="Q13eR_Gradient_perGeV * ElectronBeamEnergy"/>
40-
40+
4141
<!-- Dipole fields scaled to beam energy -->
4242
<constant name="B2AeR_B" value="B2AeR_B_perGeV * ElectronBeamEnergy"/>
4343
<constant name="B2BeR_B" value="B2BeR_B_perGeV * ElectronBeamEnergy"/>

‎compact/fields/beamline_10x166_He3.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<xi:include href="beamline_constants.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
1818

1919
<!-- Scale reference field strengths by beam energy ratio -->
20-
20+
2121
<!-- Quadrupole gradients scaled to beam energy -->
2222
<constant name="Q1eR_Gradient" value="Q1eR_Gradient_perGeV * ElectronBeamEnergy"/>
2323
<constant name="Q2eR_Gradient" value="Q2eR_Gradient_perGeV * ElectronBeamEnergy"/>
@@ -37,7 +37,7 @@
3737
<constant name="Q11eR_Gradient" value="Q11eR_Gradient_perGeV * ElectronBeamEnergy"/>
3838
<constant name="Q12eR_Gradient" value="Q12eR_Gradient_perGeV * ElectronBeamEnergy"/>
3939
<constant name="Q13eR_Gradient" value="Q13eR_Gradient_perGeV * ElectronBeamEnergy"/>
40-
40+
4141
<!-- Dipole fields scaled to beam energy -->
4242
<constant name="B2AeR_B" value="B2AeR_B_perGeV * ElectronBeamEnergy"/>
4343
<constant name="B2BeR_B" value="B2BeR_B_perGeV * ElectronBeamEnergy"/>

‎compact/fields/beamline_10x250.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<xi:include href="beamline_constants.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
1818

1919
<!-- Scale reference field strengths by beam energy ratio -->
20-
20+
2121
<!-- Quadrupole gradients scaled to beam energy -->
2222
<constant name="Q1eR_Gradient" value="Q1eR_Gradient_perGeV * ElectronBeamEnergy"/>
2323
<constant name="Q2eR_Gradient" value="Q2eR_Gradient_perGeV * ElectronBeamEnergy"/>
@@ -37,7 +37,7 @@
3737
<constant name="Q11eR_Gradient" value="Q11eR_Gradient_perGeV * ElectronBeamEnergy"/>
3838
<constant name="Q12eR_Gradient" value="Q12eR_Gradient_perGeV * ElectronBeamEnergy"/>
3939
<constant name="Q13eR_Gradient" value="Q13eR_Gradient_perGeV * ElectronBeamEnergy"/>
40-
40+
4141
<!-- Dipole fields scaled to beam energy -->
4242
<constant name="B2AeR_B" value="B2AeR_B_perGeV * ElectronBeamEnergy"/>
4343
<constant name="B2BeR_B" value="B2BeR_B_perGeV * ElectronBeamEnergy"/>

0 commit comments

Comments
 (0)