Skip to content

Commit 882e16a

Browse files
tperssontpersson
authored
Merge pull request #937 from tpersson/fixWindowsAndItteration2
Fix windows tests and also update version number and documentation
2 parents 8bad325 + b0b44e4 commit 882e16a

File tree

10 files changed

+693
-667
lines changed

10 files changed

+693
-667
lines changed

‎VERSION‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
VERSION = 5.05.02
2-
VERSION_NUM = 50502
3-
VERSION_DATE = 2019.07.25
1+
VERSION = 5.06.00
2+
VERSION_NUM = 50600
3+
VERSION_DATE = 2020.08.13

‎doc/latexuguide/coverpage.tex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
\begin{center}\LARGE % document title
1919
\textbf{The MAD-X Program} \\
2020
(Methodical Accelerator Design) \\
21-
Version 5.05.02 \\
21+
Version 5.06.00 \\
2222
\textbf{User's Reference Manual}
2323
\end{center}
2424
\vskip 1.5em

‎doc/latexuguide/elements.tex‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,4 +1810,32 @@ \section{Change of reference system}
18101810
be referred to the new coordinate system where both translations and
18111811
rotations are applied.
18121812

1813+
\section{SixTrack Marker}
1814+
1815+
\madbox{
1816+
label: SIXMARKER, \= ELTYPE=real, ATTR=\{real, \ldots \}, \\
1817+
\> F3STRING=string, F3VECTOR=\{real, \ldots \} ;
1818+
}
1819+
The \texttt{SIXMARKER} element allows the definition of a marker that is converted to SixTrack.
1820+
The element has no effect in MAD-X.
1821+
\begin{madlist}
1822+
\ttitem{ELTYPE} is the element type number in SixTrack, converted to the first column in fc.2.
1823+
\ttitem{ATTR} This defines the remaining columns of the fc.2 file.
1824+
\ttitem{F3STRING} Defines the String that is written to the fc.3 file, \{newline\} creates a new line in the output
1825+
and \{0\}\ldots\{10\} are being replaced with the values in \texttt{F3VECTOR}.
1826+
\ttitem{F3VECTOR} The values defined will be converted to the location defined in the \texttt{F3STRING}.
1827+
\end{madlist}
1828+
\textbf{Example:}
1829+
\madxmp{
1830+
sm1:SIXMARKER, ELTYPE=2, ATTR=\{0.1,2,3,4,5,6,7\}, \\
1831+
,F3STRING="NEW\_ELEMENT \{newline\} \{0\}, \{1\} \{newline\} NEXT",\\
1832+
F3VECTOR=\{0.2, 0.5\};\\
1833+
}
1834+
Will produce in the output file fc.3:
1835+
\madxmp{
1836+
NEW\_ELEMENT \\
1837+
2.00000000e-01, 5.00000000e-01 \\
1838+
NEXT
1839+
}
1840+
18131841
%%% END

‎doc/latexuguide/uguide.tex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
%\addeditor{IT}
4545

4646
\usepackage{versions}
47-
\markversion{5.05.02} % update coverpage.tex too
47+
\markversion{5.06.00} % update coverpage.tex too
4848

4949
%\usepackage{comment}
5050

‎src/mad_6track.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3309,10 +3309,10 @@ write_f3_sixmarker(struct element* el){
33093309
if (!f3) f3 = fopen("fc.3", "w");
33103310

33113311
tmp =command_par_string("f3string",el->def);
3312-
nl = element_vector(el, "attr", attrtemp);
3312+
nl = element_vector(el, "f3vector", attrtemp);
33133313

33143314
for(int i=0; i<nl; i++){
3315-
3315+
33163316
sprintf(str_att_value, "%12.8e", attrtemp[i]);
33173317

33183318
strcpy(nstr2,"{");

‎tests/test-c6t-7/fc.3.ref‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
NEW ELEMENT
2-
1.00000000e-01, 2.00000000e+00
1+
NEW_ELEMENT
2+
2.00000000e-01, 5.00000000e-01
33
NEXT

‎tests/test-c6t-7/test-c6t-7.madx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
circum=10;
22

3-
sm1:sixmarker, eltype=2, attr={0.1,2,3,4,5,6,7}, f3string="NEW ELEMENT {newline} {0}, {1} {newline}NEXT", f3vector={0.2, 0.5};
3+
sm1:SIXMARKER, eltype=2, attr={0.1,2,3,4,5,6,7}, f3string="NEW_ELEMENT {newline} {0}, {1} {newline}NEXT", f3vector={0.2, 0.5};
44
m1: multipole, knl={0, 0.2};
55
show, sm1;
66

‎tests/test-c6t-7/test-c6t-7.ref‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11

22
++++++++++++++++++++++++++++++++++++++++++++
3-
+ MAD-X 5.05.02 (64 bit, Linux) +
3+
+ MAD-X 5.06.00 (64 bit, Linux) +
44
+ Support: [email protected], http://cern.ch/mad +
5-
+ Release date: 2019.07.25 +
6-
+ Execution date: 2020.07.29 11:40:44 +
5+
+ Release date: 2020.08.13 +
6+
+ Execution date: 2020.08.12 09:18:15 +
77
++++++++++++++++++++++++++++++++++++++++++++
88
circum=10;
99

1010

1111

12-
sm1:sixmarker, eltype=2, attr={0.1,2,3,4,5,6,7}, f3string="NEW ELEMENT {newline} {0}, {1} {newline}NEXT", f3vector={0.2, 0.5};
12+
sm1:SIXMARKER, eltype=2, attr={0.1,2,3,4,5,6,7}, f3string="NEW_ELEMENT {newline} {0}, {1} {newline}NEXT", f3vector={0.2, 0.5};
1313

1414
m1: multipole, knl={0, 0.2};
1515

@@ -26,7 +26,7 @@ parameter: polarity double value: 0
2626
parameter: tilt double value: 0
2727
parameter: lrad double value: 0
2828
parameter: magnet integer: 0
29-
parameter: f3string string: NEW ELEMENT {newline} {0}, {1} {newline}NEXT
29+
parameter: f3string string: NEW_ELEMENT {newline} {0}, {1} {newline}NEXT
3030
parameter: f3vector double array: 2.000000e-01 5.000000e-01
3131
parameter: eltype integer: 2
3232
parameter: attr double array: 1.000000e-01 2.000000e+00 3.000000e+00 4.000000e+00 5.000000e+00 6.000000e+00 7.000000e+00
@@ -77,7 +77,7 @@ parameter: polarity double value: 0
7777
parameter: tilt double value: 0
7878
parameter: lrad double value: 0
7979
parameter: magnet integer: 0
80-
parameter: f3string string: NEW ELEMENT {newline} {0}, {1} {newline}NEXT
80+
parameter: f3string string: NEW_ELEMENT {newline} {0}, {1} {newline}NEXT
8181
parameter: f3vector double array: 2.000000e-01 5.000000e-01
8282
parameter: eltype integer: 2
8383
parameter: attr double array: 1.000000e-01 2.000000e+00 3.000000e+00 4.000000e+00 5.000000e+00 6.000000e+00 7.000000e+00

0 commit comments

Comments
 (0)