diff --git a/ip6/far_forward_fields_100.xml b/ip6/far_forward_fields_100.xml index 996645d3462a2e7ec4f1c447e919036144b89f10..1ce9dab2ef650387d76a05190f9a5321fe123ec7 100644 --- a/ip6/far_forward_fields_100.xml +++ b/ip6/far_forward_fields_100.xml @@ -1,19 +1,14 @@ <define> <comment> - All magnet values are input by hand and represent the implementation in EICRoot used for the Yellow Report. - - The original values were calculated for 275 GeV ions. For now, we can get a lower energy tune - by scaling down all magnets (except for B0pf) by new_beam_energy/275. - - This is the 100GeV file, so we applied 100/275. + These are the values from Scott's tables for the 50cm shifted hadron FF 100 GeV proton lattice. Notice they mostly do not scale with beam energy in the staightforward way from the previous lattice. </comment> <constant name="B0PF_GradientMax" value="-8.12238283*tesla/m"/> <constant name="B0APF_GradientMax" value="0.0*tesla/m"/> - <constant name="Q1APF_GradientMax" value="-26.40290909*tesla/m"/> - <constant name="Q1BPF_GradientMax" value="-22.99827419*tesla/m"/> - <constant name="Q2PF_GradientMax" value="13.4120059*tesla/m"/> + <constant name="Q1APF_GradientMax" value="-44.08979*tesla/m"/> + <constant name="Q1BPF_GradientMax" value="0.0*tesla/m"/> <!-- need to check with Scott on this one --> + <constant name="Q2PF_GradientMax" value="12.7764668*tesla/m"/> <constant name="B1PF_GradientMax" value="0.0*tesla/m"/> <constant name="B1APF_GradientMax" value="0.0*tesla/m"/> <constant name="B2PF_GradientMax" value="0.0*tesla/m"/> @@ -21,13 +16,13 @@ <constant name="Q1EF_GradientMax" value="2.127596364*tesla/m"/> <constant name="B0PF_Bmax" value="1.1840539*tesla"/> - <constant name="B0APF_Bmax" value="1.247798873*tesla"/> + <constant name="B0APF_Bmax" value="1.1588921*tesla"/> <!-- need to check with Scott on this one --> <constant name="Q1APF_Bmax" value="0.0*tesla"/> <constant name="Q1BPF_Bmax" value="0.0*tesla"/> <constant name="Q2PF_Bmax" value="0.0*tesla"/> - <constant name="B1PF_Bmax" value="1.253814182*tesla"/> - <constant name="B1APF_Bmax" value="0.9818181818*tesla"/> - <constant name="B2PF_Bmax" value="-1.741459709*tesla"/> + <constant name="B1PF_Bmax" value="1.29077532*tesla"/> + <constant name="B1APF_Bmax" value="0.98178068*tesla"/> + <constant name="B2PF_Bmax" value="-1.74139319*tesla"/> <constant name="Q0EF_BMax" value="0.0*tesla"/> <constant name="Q1EF_BMax" value="0.0*tesla"/> diff --git a/ip6/far_forward_fields_41.xml b/ip6/far_forward_fields_41.xml index 8dd1f9a9cb4e06517211725903120a9df35342c7..aa5a7f603f0191ac95805962d269bf66f2497e33 100644 --- a/ip6/far_forward_fields_41.xml +++ b/ip6/far_forward_fields_41.xml @@ -1,19 +1,14 @@ <define> <comment> - All magnet values are input by hand and represent the implementation in EICRoot used for the Yellow Report. - - The original values were calculated for 275 GeV ions. For now, we can get a lower energy tune - by scaling down all magnets (except for B0pf) by new_beam_energy/275. - - This is the 41GeV file, so we applied 41/275. + These are the values from Scott's tables for the 50cm shifted hadron FF 41 GeV proton lattice. Notice they mostly do not scale with beam energy in the staightforward way from the previous lattice. </comment> <constant name="B0PF_GradientMax" value="-8.12238283*tesla/m"/> <constant name="B0APF_GradientMax" value="0.0*tesla/m"/> - <constant name="Q1APF_GradientMax" value="-10.82519273*tesla/m"/> - <constant name="Q1BPF_GradientMax" value="-9.429292418*tesla/m"/> - <constant name="Q2PF_GradientMax" value="5.49892242*tesla/m"/> + <constant name="Q1APF_GradientMax" value="-15.381768*tesla/m"/> + <constant name="Q1BPF_GradientMax" value="0.0*tesla/m"/> <!-- need to check with Scott on this one --> + <constant name="Q2PF_GradientMax" value="5.40545729*tesla/m"/> <constant name="B1PF_GradientMax" value="0.0*tesla/m"/> <constant name="B1APF_GradientMax" value="0.0*tesla/m"/> <constant name="B2PF_GradientMax" value="0.0*tesla/m"/> @@ -21,13 +16,13 @@ <constant name="Q1EF_GradientMax" value="0.8723145091*tesla/m"/> <constant name="B0PF_Bmax" value="1.1840539*tesla"/> - <constant name="B0APF_Bmax" value="0.5115975378*tesla"/> + <constant name="B0APF_Bmax" value="-2.559005681*tesla"/> <!-- need to check with Scott on this one --> <constant name="Q1APF_Bmax" value="0.0*tesla"/> <constant name="Q1BPF_Bmax" value="0.0*tesla"/> <constant name="Q2PF_Bmax" value="0.0*tesla"/> - <constant name="B1PF_Bmax" value="0.5140638145*tesla"/> - <constant name="B1APF_Bmax" value="0.4025454545*tesla"/> - <constant name="B2PF_Bmax" value="-0.7139984807*tesla"/> + <constant name="B1PF_Bmax" value="0.5920021*tesla"/> + <constant name="B1APF_Bmax" value="0.40244238*tesla"/> + <constant name="B2PF_Bmax" value="-0.71381565*tesla"/> <constant name="Q0EF_BMax" value="0.0*tesla"/> <constant name="Q1EF_BMax" value="0.0*tesla"/>