Commit ea6a4cb1 authored by Spencer Kiy's avatar Spencer Kiy 🥑
Browse files

Merge branch 'master' into 'sureshdev'

# Conflicts:
#   ariel/tune/tunesequence/agtedb37-agtcdb1_design.xml
parents 5728209f 97162f12
<?xml version='1.0' encoding='UTF-8' ?>
<beampath xmlns:xi='http://www.w3.org/2001/XInclude'>
<xi:include href='../sequence/AGTE_6.xml' />
<xi:include href='../sequence/AGTE_7.xml' />
<xi:include href='../sequence/AGTE_7.xml' reverse="True" />
<xi:include href='../sequence/AGTC_1.xml' />
<xi:include href='../sequence/AGTC_2.xml' />
<xi:include href='../sequence/AGTS_2.xml' />
<xi:include href='../sequence/AGTS_3.xml'/>
<xi:include href='../sequence/AGTY_1.xml' />
<xi:include href='../sequence/AGTY_2.xml' />
</beampath>
......@@ -14,10 +14,7 @@
<xi:include href='./tunesequence/avtedb14-agtedb21_design.xml' />
<xi:include href='./tunesequence/agtedb21-agtedb37_design.xml' />
<notes>
Below commented out until APDT bug in tuneX is resolved, use apdt-ebis-ayield path instead
</notes>
<!-- <xi:include href='./tunesequence/agtedb37-agtcdb1_design.xml' />
<xi:include href='./tunesequence/agtcdb1-agtcdb12_design.xml' /> -->
<xi:include href='./tunesequence/agtedb37-agtcdb1_design.xml' />
<xi:include href='./tunesequence/agtcdb1-agtcdb12_design.xml' />
</root>
\ No newline at end of file
<root xmlns:xi='http://www.w3.org/2001/XInclude'>
<xi:include href='./tunesequence/agtedb37-agtcdb1_design.xml' />
<xi:include href='./tunesequence/agtcdb1-agtcdb12_design.xml' />
<xi:include href='./tunesequence/agtcdb12-agtcdb27_design.xml' />
<xi:include href='./tunesequence/agtcdb27-agtsdb9_design.xml' />
<xi:include href='./tunesequence/agtsdb9-agtsdb13_design.xml' />
<xi:include href='./tunesequence/agtsdb13-agtsdb19_design.xml' />
<xi:include href='./tunesequence/agtsdb19-agtydb13_design.xml' />
<xi:include href='./tunesequence/agtydb13-agtydb17_design.xml' />
</root>
\ No newline at end of file
......@@ -8,18 +8,14 @@
<xi:include href='./tunesequence/agtedb13-agtedb21_design.xml' />
<xi:include href='./tunesequence/agtedb21-agtedb37_design.xml' />
<notes>
Below commented out until APDT bug in tuneX is resolved, use apdt-ebis-ayield path instead
</notes>
<!-- <xi:include href='./tunesequence/agtedb37-agtcdb1_design.xml' />
<xi:include href='./tunesequence/agtedb37-agtcdb1_design.xml' />
<xi:include href='./tunesequence/agtcdb1-agtcdb12_design.xml' />
<xi:include href='./tunesequence/agtcdb12-agtcdb27_design.xml' />
<xi:include href='./tunesequence/agtcdb27-agtsdb9_design.xml' />
<xi:include href='./tunesequence/agtsdb9-agtsdb13_design.xml' />
<xi:include href='./tunesequence/agtsdb13-agtsdb19_design.xml' />
<xi:include href='./tunesequence/agtsdb19-agtydb13_design.xml' />
<xi:include href='./tunesequence/agtydb13-agtydb17_design.xml' /> -->
<xi:include href='./tunesequence/agtydb13-agtydb17_design.xml' />
</root>
<tune chargestate="19.0" energy="0.012*MeV" id="AGTC:B1" mass="132.90545*u">
<tune chargestate="19.0" energy="0.228*MeV" id="AGTC:B1" mass="132.90545*u">
<notes>Initial values provided by Suresh</notes>
<set pv="AGTC:B1:POS:VOL" value="1674.0*V"/>
......
<tune chargestate="19.0" energy="0.012*MeV" id="AGTC:Q12" mass="132.90545*u">
<tune chargestate="19.0" energy="0.228*MeV" id="AGTC:Q12" mass="132.90545*u">
<notes>Initial values provided by Suresh</notes>
<set pv="AGTC:Q12:VOL" value="157.6*V"/>
......
<tune chargestate="19.0" energy="0.012*MeV" id="AGTC:Q28" mass="132.90545*u">
<tune chargestate="19.0" energy="0.228*MeV" id="AGTC:Q28" mass="132.90545*u">
<notes>Initial values provided by Suresh</notes>
<notes> Two back to back ARIEL periodic modules from AGTC:Q28 to AGTC:Q31.</notes>
......
<tune chargestate="1.0" energy="0.012*MeV" id="AGTE:YCB37" mass="132.90545*u">
<notes>Initial values provided by SS to SK for ARIEL TuneX tests</notes>
<tune chargestate="1.0" energy="0.012*MeV" id="APDT:BIAS" mass="132.90545*u">
<notes>Initial values provided by Suresh.</notes>
<set pv="AGTE:YCB37:VOL" value="0.0*V"/>
<set pv="AGTE:XCB37:VOL" value="0.0*V"/>
<set pv="AGTE:EL38:VOL" value="-6992.0*V" tuneable="True"/>
......
<tune chargestate="19.0" energy="0.012*MeV" id="AGTS:Q14" mass="132.90545*u">
<tune chargestate="19.0" energy="0.228*MeV" id="AGTS:Q14" mass="132.90545*u">
<notes>Initial values provided by Suresh</notes>
<notes> One ARIEL order reversing module from AGTS:Q18 to AGTS:Q19.</notes>
......
<tune chargestate="19.0" energy="0.012*MeV" id="AGTS:XCB19" mass="132.90545*u">
<tune chargestate="19.0" energy="0.228*MeV" id="AGTS:XCB19" mass="132.90545*u">
<notes>Initial values provided by Suresh</notes>
<set pv="AGTS:XCB19:VOL" value="0.0*V"/>
......
<tune chargestate="19.0" energy="0.012*MeV" id="AGTS:Q10" mass="132.90545*u">
<tune chargestate="19.0" energy="0.228*MeV" id="AGTS:Q10" mass="132.90545*u">
<notes>Initial values provided by Suresh</notes>
<notes> Two back to back ARIEL periodic modules from AGTS:Q10 to AGTS:Q13.</notes>
......
<tune chargestate="19.0" energy="0.012*MeV" id="AGTY:Q14" mass="132.90545*u">
<tune chargestate="19.0" energy="0.228*MeV" id="AGTY:Q14" mass="132.90545*u">
<notes>Initial values provided by Suresh</notes>
<set pv="AGTY:Q14:VOL" value="172.8*V"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment