Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changed default behaviour for long_names flag in conversion to SixTrack. #999

Merged
merged 1 commit into from
Apr 6, 2021
Merged

Changed default behaviour for long_names flag in conversion to SixTrack. #999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/latexuguide/c6t.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ \chapter{Conversion to \textit{SixTrack}}

\ttitem{MARKALL} (optional flag, default false) flag to convert all markers through the conversion. If false, only markers with names beginning with "ip" or "mt\_" are kept.

\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{LONG\_NAMES} (optional flag, default true) 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.

Expand Down
2 changes: 1 addition & 1 deletion src/mad_dict.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ const char *const_command_def =
"aperture = [l, false, true], "
"split = [l, false, true], "
"mangle = [l, false, true], "
"long_names = [l, false, true], "
"long_names = [l, true, false], "
"multicol = [l, false, true], "
"max_mult_ord = [i, 11], "
"six_version = [i, 0], "
Expand Down
1,634 changes: 817 additions & 817 deletions tests/test-c6t-2/fc.2.ref
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions tests/test-c6t-2/test-c6t-2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

++++++++++++++++++++++++++++++++++++++++++++
+ MAD-X 5.05.02 (64 bit, Linux) +
+ MAD-X 5.06.01 (64 bit, Linux) +
+ Support: mad@cern.ch, http://cern.ch/mad +
+ Release date: 2019.07.25 +
+ Execution date: 2020.07.29 11:39:53 +
+ Release date: 2020.09.01 +
+ Execution date: 2021.03.31 13:31:17 +
++++++++++++++++++++++++++++++++++++++++++++
TITLE;

Expand Down Expand Up @@ -53,6 +53,7 @@ sixtrack,split;
++++++++++++++++++++++++++++

++++++ info: c6t - split flag selected
++++++ info: c6t - long names flag selected
Reference radius set to : 1.000000
++++++ info: MADX sequence converted to c6t internal.

Expand Down
232 changes: 116 additions & 116 deletions tests/test-c6t-3/fc.2.ref
View file
Open in desktop

Large diffs are not rendered by default.

23,224 changes: 11,612 additions & 11,612 deletions tests/test-c6t-4/fc.2.ref
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions tests/test-c6t-4/test-c6t-4.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

++++++++++++++++++++++++++++++++++++++++++++
+ MAD-X 5.05.02 (64 bit, Linux) +
+ MAD-X 5.06.01 (64 bit, Linux) +
+ Support: mad@cern.ch, http://cern.ch/mad +
+ Release date: 2019.07.25 +
+ Execution date: 2020.08.10 13:27:04 +
+ Release date: 2020.09.01 +
+ Execution date: 2021.03.31 13:31:17 +
++++++++++++++++++++++++++++++++++++++++++++
Title, "test-c6t-4 conversion of thick elements with apertures";

Expand Down Expand Up @@ -1634,6 +1634,7 @@ Sixtrack, aperture;
++++++++++++++++++++++++++++

++++++ info: c6t - aperture flag selected
++++++ info: c6t - long names flag selected
Reference radius set to : 1.000000
++++++ info: MADX sequence converted to c6t internal.

Expand Down
68 changes: 34 additions & 34 deletions tests/test-c6t-5/fc.2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
SINGLE ELEMENTS---------------------------------------------------------
qfstart 2 -1.163814800e-01 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
drift_0 0 0.000000000e+00 0.000000000e+00 1.000000000e+01 0.000000000e+00 0.000000000e+00 0.000000000e+00
qd 2 1.175570505e-01 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
drift_1 0 0.000000000e+00 0.000000000e+00 1.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
hkick 1 3.000000000e-04 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
drift_2 0 0.000000000e+00 0.000000000e+00 2.000000000e-01 0.000000000e+00 0.000000000e+00 0.000000000e+00
vkick -1 1.033000000e-02 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
drift_3 0 0.000000000e+00 0.000000000e+00 8.800000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
qf 2 -1.175570505e-01 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
drift_8 0 0.000000000e+00 0.000000000e+00 2.000000000e-02 0.000000000e+00 0.000000000e+00 0.000000000e+00
rfcav 12 1.000000000e-01 1.000000000e+02 1.800000000e+02 0.000000000e+00 0.000000000e+00 0.000000000e+00
drift_9 0 0.000000000e+00 0.000000000e+00 9.980000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
drift_10 0 0.000000000e+00 0.000000000e+00 4.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
matloc.bim 22 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
drift_11 0 0.000000000e+00 0.000000000e+00 6.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
qfstart 2 -1.163814799539097e-01 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
drift_0 0 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+01 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
qd 2 1.175570504584946e-01 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
drift_1 0 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
hkick 1 3.000000000000000e-04 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
drift_2 0 0.000000000000000e+00 0.000000000000000e+00 2.000000000000011e-01 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
vkick -1 1.033000000000000e-02 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
drift_3 0 0.000000000000000e+00 0.000000000000000e+00 8.799999999999999e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
qf 2 -1.175570504584946e-01 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
drift_8 0 0.000000000000000e+00 0.000000000000000e+00 1.999999999999602e-02 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
rfcav 12 1.000000000000000e-01 1.000000000000000e+02 1.800000000000000e+02 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
drift_9 0 0.000000000000000e+00 0.000000000000000e+00 9.980000000000004e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
drift_10 0 0.000000000000000e+00 0.000000000000000e+00 4.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
matloc.bim 22 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
drift_11 0 0.000000000000000e+00 0.000000000000000e+00 6.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
NEXT
BLOCK DEFINITIONS-------------------------------------------------------
1 1
BLOC1 drift_0
BLOC2 drift_1
BLOC3 drift_2
BLOC4 drift_3
BLOC5 drift_8
BLOC6 drift_9
BLOC7 drift_10
BLOC8 drift_11
BLOC1 drift_0
BLOC2 drift_1
BLOC3 drift_2
BLOC4 drift_3
BLOC5 drift_8
BLOC6 drift_9
BLOC7 drift_10
BLOC8 drift_11
NEXT
STRUCTURE INPUT---------------------------------------------------------
qfstart BLOC1 qd
BLOC2 hkick BLOC3
vkick BLOC4 qf
BLOC1 qd BLOC1
qf BLOC1 qd
BLOC1 qf BLOC5
rfcav BLOC6 qd
BLOC7 matloc.bim BLOC8
qf BLOC1 qd
BLOC1 qf BLOC1
qd BLOC1
qfstart BLOC1 qd
BLOC2 hkick BLOC3
vkick BLOC4 qf
BLOC1 qd BLOC1
qf BLOC1 qd
BLOC1 qf BLOC5
rfcav BLOC6 qd
BLOC7 matloc.bim BLOC8
qf BLOC1 qd
BLOC1 qf BLOC1
qd BLOC1
NEXT
7 changes: 4 additions & 3 deletions tests/test-c6t-5/test-c6t-5.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

++++++++++++++++++++++++++++++++++++++++++++
+ MAD-X 5.05.02 (64 bit, Linux) +
+ MAD-X 5.06.01 (64 bit, Linux) +
+ Support: mad@cern.ch, http://cern.ch/mad +
+ Release date: 2019.07.25 +
+ Execution date: 2020.07.29 16:26:12 +
+ Release date: 2020.09.01 +
+ Execution date: 2021.03.31 13:31:39 +
++++++++++++++++++++++++++++++++++++++++++++
circum=120.;

Expand Down Expand Up @@ -303,6 +303,7 @@ sixtrack, CAVALL;
++++++++++++++++++++++++++++

++++++ info: c6t - cavall flag selected
++++++ info: c6t - long names flag selected
Reference radius set to : 1.000000
++++++ info: MADX sequence converted to c6t internal.

Expand Down
7 changes: 4 additions & 3 deletions tests/test-c6t-6/test-c6t-6.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

++++++++++++++++++++++++++++++++++++++++++++
+ MAD-X 5.05.02 (64 bit, Linux) +
+ MAD-X 5.06.01 (64 bit, Linux) +
+ Support: mad@cern.ch, http://cern.ch/mad +
+ Release date: 2019.07.25 +
+ Execution date: 2020.08.10 13:27:26 +
+ Release date: 2020.09.01 +
+ Execution date: 2021.03.31 13:31:40 +
++++++++++++++++++++++++++++++++++++++++++++
SET, FORMAT="12d", "-18.5e", "25s";

Expand Down Expand Up @@ -127,6 +127,7 @@ sixtrack;
+ c6t version 2.0 +
++++++++++++++++++++++++++++

++++++ info: c6t - long names flag selected
Reference radius set to : 1.000000
++++++ info: MADX sequence converted to c6t internal.

Expand Down
16 changes: 8 additions & 8 deletions tests/test-c6t-7/fc.2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
SINGLE ELEMENTS---------------------------------------------------------
drift_0 0 0.000000000e+00 0.000000000e+00 1.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
sm1 2 1.000000000e-01 2.000000000e+00 3.000000000e+00 4.000000000e+00 5.000000000e+00 6.000000000e+00
m1 2 -2.000000000e-01 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
drift_2 0 0.000000000e+00 0.000000000e+00 8.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
drift_0 0 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
sm1 2 1.000000000000000e-01 2.000000000000000e+00 3.000000000000000e+00 4.000000000000000e+00 5.000000000000000e+00 6.000000000000000e+00
m1 2 -2.000000000000000e-01 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
drift_2 0 0.000000000000000e+00 0.000000000000000e+00 8.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
NEXT
BLOCK DEFINITIONS-------------------------------------------------------
1 1
BLOC1 drift_0
BLOC2 drift_2
BLOC1 drift_0
BLOC2 drift_2
NEXT
STRUCTURE INPUT---------------------------------------------------------
BLOC1 sm1 BLOC1
m1 BLOC2
BLOC1 sm1 BLOC1
m1 BLOC2
NEXT
7 changes: 4 additions & 3 deletions tests/test-c6t-7/test-c6t-7.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

++++++++++++++++++++++++++++++++++++++++++++
+ MAD-X 5.06.00 (64 bit, Linux) +
+ MAD-X 5.06.01 (64 bit, Linux) +
+ Support: mad@cern.ch, http://cern.ch/mad +
+ Release date: 2020.08.13 +
+ Execution date: 2020.08.12 09:18:15 +
+ Release date: 2020.09.01 +
+ Execution date: 2021.03.31 13:31:40 +
++++++++++++++++++++++++++++++++++++++++++++
circum=10;

Expand Down Expand Up @@ -148,6 +148,7 @@ sixtrack;
+ c6t version 2.0 +
++++++++++++++++++++++++++++

++++++ info: c6t - long names flag selected
Reference radius set to : 1.000000
++++++ info: MADX sequence converted to c6t internal.

Expand Down
7 changes: 4 additions & 3 deletions tests/test-c6t-8/test-c6t-8.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

++++++++++++++++++++++++++++++++++++++++++++
+ MAD-X 5.05.02 (64 bit, Linux) +
+ MAD-X 5.06.01 (64 bit, Linux) +
+ Support: mad@cern.ch, http://cern.ch/mad +
+ Release date: 2019.07.25 +
+ Execution date: 2020.08.06 15:15:42 +
+ Release date: 2020.09.01 +
+ Execution date: 2021.03.31 13:31:40 +
++++++++++++++++++++++++++++++++++++++++++++


Expand Down Expand Up @@ -84,6 +84,7 @@ sixtrack;
+ c6t version 2.0 +
++++++++++++++++++++++++++++

++++++ info: c6t - long names flag selected
Reference radius set to : 1.000000
nnwires 0
nnwires 1
Expand Down
5 changes: 3 additions & 2 deletions tests/test-permalign-2/test-permalign-2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
+ MAD-X 5.06.01 (64 bit, Linux) +
+ Support: mad@cern.ch, http://cern.ch/mad +
+ Release date: 2020.09.01 +
+ Execution date: 2021.02.03 14:43:15 +
+ Execution date: 2021.03.31 13:43:54 +
++++++++++++++++++++++++++++++++++++++++++++
a = 0.1;

Expand Down Expand Up @@ -110,6 +110,7 @@ sixtrack;
+ c6t version 2.0 +
++++++++++++++++++++++++++++

++++++ info: c6t - long names flag selected
Reference radius set to : 1.000000
++++++ info: MADX sequence converted to c6t internal.

Expand Down Expand Up @@ -205,7 +206,7 @@ PTC_TWISS, table=twiss, icase=5, no=5, betx=1, bety=2, betz=10, x=xin, y=yin, t=

pycomin tcomin ptcomin
-0.006631611308 -0 0
write, table=twiss, file="twiss.ptc.tfs";
write, table=twiss, file="twiss.ptc.tfs";

Number of warnings: 4
4 in C and 0 in Fortran
Expand Down
16 changes: 8 additions & 8 deletions tests/test-rfmultipole-5/fc.2.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
SINGLE ELEMENTS---------------------------------------------------------
rfm1q 26 -2.000000000e+00 1.200000000e+01 -0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
rfm1s 27 -1.500000000e+00 1.200000000e+01 -0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
rfm1qs -26 -1.000000000e-01 1.200000000e+01 -0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
rfm1ss -27 -3.500000000e+00 1.200000000e+01 -0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
drift_0 0 0.000000000e+00 0.000000000e+00 1.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
m1 11 1.000000000e+00 1.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
rfm1q 26 -2.000000000000000e+00 1.200000000000000e+01 -0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
rfm1s 27 -1.500000000000000e+00 1.200000000000000e+01 -0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
rfm1qs -26 -1.000000000000000e-01 1.200000000000000e+01 -0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
rfm1ss -27 -3.500000000000000e+00 1.200000000000000e+01 -0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
drift_0 0 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
m1 11 1.000000000000000e+00 1.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
NEXT
BLOCK DEFINITIONS-------------------------------------------------------
1 1
BLOC1 drift_0
BLOC1 drift_0
NEXT
STRUCTURE INPUT---------------------------------------------------------
rfm1q rfm1s rfm1qs rfm1ss BLOC1 m1
rfm1q rfm1s rfm1qs rfm1ss BLOC1 m1
NEXT