Merge pull request #715 from tpersson/rfmulti2six

Rfmulti2sixTrack
MethodicalAcceleratorDesign · Jan 15, 2019 · bce7e27 · bce7e27
2 parents 6379d22 + e439ba0
commit bce7e27
Show file tree

Hide file tree

Showing 12 changed files with 575 additions and 181 deletions.
diff --git a/Makefile_test b/Makefile_test
@@ -68,7 +68,7 @@ test-match-5 test-match-6 test-match-7 test-match-8 test-match-9 test-match-10\
 test-aperture test-aperture-2 test-aperture-3 \
 test-beam \
 \
-test-rfmultipole test-rfmultipole-2 test-rfmultipole-3 test-rfmultipole-4 test-rfmultipole-5 test-rfmultipole-6 \
+test-rfmultipole test-rfmultipole-2 test-rfmultipole-3 test-rfmultipole-4 test-rfmultipole-5 test-rfmultipole-6 test-rfmultipole-7 \
 \
 test-ptc-twiss-1 test-ptc-twiss-2 test-ptc-twiss-3 test-ptc-twiss-4 \
 test-ptc-twiss-old1 test-ptc-twiss-old2 test-ptc-twiss-old3 test-ptc-twiss-old4 test-ptc-twiss-old5 test-ptc-twiss-old6 test-ptc-twiss-old7 \

diff --git a/doc/latexuguide/c6t.tex b/doc/latexuguide/c6t.tex
@@ -59,6 +59,8 @@ \chapter{Conversion to \textit{SixTrack}}
 
    \ttitem{LONG\_NAMES} (optional flag, default false) flag to increase the possible length of names (from 17 to 48) and increase the number of digits in the output in the conversion. 
 
+   \ttitem{SIX_VERSION} (optional, default value=0) Some new formats are only supported in recent versions of SixTrack. In order to output in these formats a version number higher or equal to the number when it was implemented needs to be set. If the needed SixTrack version is 5.02.03 then the version should be set to 50203.  
+
 \end{madlist}
 
 \textbf{Important Notes:}