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

Enables reading turn number and particle ID from table #533

Merged
merged 5 commits into from
Jan 16, 2018
Merged

Enables reading turn number and particle ID from table #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8322a93
Actually turn number was a double precision but the table format for …
tpersson Dec 19, 2017
d305af4
Updated some more tests.
tpersson Dec 19, 2017
213c0d2
Updated more test.
tpersson Dec 19, 2017
fbb7b70
Forgot to update this test..
tpersson Dec 19, 2017
3fe8137
Another test I forgot to update...
tpersson Dec 26, 2017
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 src/mad_gcst.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ const char* const summ_table_cols[] =

const int trackone_table_types[] =
{
1, 1, 2, 2, 2, 2, 2, 2, 2, 2
2, 2, 2, 2, 2, 2, 2, 2, 2, 2
};

const char* const trackone_table_cols[] =
Expand Down
2 changes: 1 addition & 1 deletion tests/test-ptc-track-3/trackone.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@ DATE %08s "14/12/17"
@ TIME %08s "18.07.28"
* NUMBER TURN X PX Y PY T PT S E
$ %d %d %le %le %le %le %le %le %le %le
$ %le %le %le %le %le %le %le %le %le %le
#segment 1 21 1 0 start
1 0 0.001 0 0 0 0 0 0 450.0009782
#segment 2 21 1 13209 LHCB1$END
Expand Down
2 changes: 1 addition & 1 deletion tests/test-ptc-track/trackoneLag0.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@ DATE %08s "14/12/17"
@ TIME %08s "18.07.18"
* NUMBER TURN X PX Y PY T PT S E
$ %d %d %le %le %le %le %le %le %le %le
$ %le %le %le %le %le %le %le %le %le %le
#segment 1 2 21 0 start
1 0 0 0 0 0 -0.5 0 0 0.12
2 0 0 0 0 0 -0.45 0 0 0.12
Expand Down
2 changes: 1 addition & 1 deletion tests/test-ptc-track/trackoneLag90.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@ DATE %08s "14/12/17"
@ TIME %08s "18.07.18"
* NUMBER TURN X PX Y PY T PT S E
$ %d %d %le %le %le %le %le %le %le %le
$ %le %le %le %le %le %le %le %le %le %le
#segment 1 2 21 0 start
1 0 0 0 0 0 -0.5 0 0 0.12
2 0 0 0 0 0 -0.45 0 0 0.12
Expand Down
2 changes: 1 addition & 1 deletion tests/test-ptc-trackline-2/trackone.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@ DATE %08s "14/12/17"
@ TIME %08s "18.07.33"
* NUMBER TURN X PX Y PY T PT S E
$ %d %d %le %le %le %le %le %le %le %le
$ %le %le %le %le %le %le %le %le %le %le
1 1 -0.0095 0 0 0 0.0026388815 0 0 0.02
1 1 0.006111954327 0.0001862236679 0 0 9.003963587 -0.009281386161 9 0.04799709698
2 1 -0.0085 0 0 0 0.0026388815 0 0 0.02
Expand Down
2 changes: 1 addition & 1 deletion tests/test-ptc-trackline-3/trackone.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@ DATE %08s "14/12/17"
@ TIME %08s "18.07.43"
* NUMBER TURN X PX Y PY T PT S E
$ %d %d %le %le %le %le %le %le %le %le
$ %le %le %le %le %le %le %le %le %le %le
1 1 0.001 0 0 0 0 0 0 450.0009782
1 1 -0.0025239558 -0.0002646530315 -0.001697396742 0.0002269819565 3.14790959e-05 0 26658.8832 450.0009782
1 2 -0.0025239558 -0.0002646530315 -0.001697396742 0.0002269819565 3.14790959e-05 0 26658.8832 450.0009782
Expand Down
2 changes: 1 addition & 1 deletion tests/test-ptc-trackline/trackone.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
@ DATE %08s "14/12/17"
@ TIME %08s "18.07.32"
* NUMBER TURN X PX Y PY T PT S E
$ %d %d %le %le %le %le %le %le %le %le
$ %le %le %le %le %le %le %le %le %le %le
1 1 0.001 0.0003 -0.002 0 0.0015 0 0 0.02
1 1 0.001931299248 -8.396879385e-05 0.0001405623067 0.0007815904139 4.502485489 -0.0230004599 4.5 0.03199761733
2 changes: 1 addition & 1 deletion tests/test-rfmultipole-ptc-1/trackone.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@ DATE %08s "14/12/17"
@ TIME %08s "18.07.45"
* NUMBER TURN X PX Y PY T PT S E
$ %d %d %le %le %le %le %le %le %le %le
$ %le %le %le %le %le %le %le %le %le %le
1 1 0 0 0 0 -0 0 0 10
1 1 1.104835655e-36 1.004385756e-35 0 0 0.16 3.412048536e-75 0.16 10
1 2 -1.05740687e-07 1.242479028e-08 0 0 24.19999992 3.412048536e-75 24.2 10
Expand Down
2 changes: 1 addition & 1 deletion tests/test-track-3/out_done.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
@ DATE %08s "14/12/17"
@ TIME %08s "17.54.31"
* NUMBER TURN X PX Y PY T PT S E
$ %d %d %le %le %le %le %le %le %le %le
$ %le %le %le %le %le %le %le %le %le %le
#segment 1 2 20 0 start
1 0 9.9261838e-05 0 0.000309389318 0 0 0 0 0
2 0 -0.00011464436 0 0.000990202248 0 0 0 0 0
Expand Down
2 changes: 1 addition & 1 deletion tests/test-track-3/out_fone.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
@ DATE %08s "14/12/17"
@ TIME %08s "17.54.31"
* NUMBER TURN X PX Y PY T PT S E
$ %d %d %le %le %le %le %le %le %le %le
$ %le %le %le %le %le %le %le %le %le %le
#segment 1 2 20 0 start
1 0 0.00043813432 0 -0.000201190396 0 0 0 0 0
2 0 0.000372483362 0 -0.0003487182 0 0 0 0 0
Expand Down
2 changes: 1 addition & 1 deletion tests/test-track-4/out_done.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
@ DATE %08s "14/12/17"
@ TIME %08s "17.54.31"
* NUMBER TURN X PX Y PY T PT S E
$ %d %d %le %le %le %le %le %le %le %le
$ %le %le %le %le %le %le %le %le %le %le
#segment 1 2 20 0 start
1 0 0.000297785514 0 0.000464083977 0 0 0 0 0
2 0 -0.00034393308 0 0.001485303372 0 0 0 0 0
Expand Down
2 changes: 1 addition & 1 deletion tests/test-track-5/out_rellipseone.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
@ DATE %08s "14/12/17"
@ TIME %08s "17.54.31"
* NUMBER TURN X PX Y PY T PT S E
$ %d %d %le %le %le %le %le %le %le %le
$ %le %le %le %le %le %le %le %le %le %le
#segment 1 2 20 0 start
1 0 0.000198523676 0 0.0005259618406 0 0 0 0 0
2 0 -0.00022928872 0 0.001683343822 0 0 0 0 0
Expand Down
2 changes: 1 addition & 1 deletion tests/test-track/out_test-track_ap_collimatorone.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
@ DATE %08s "14/12/17"
@ TIME %08s "17.54.19"
* NUMBER TURN X PX Y PY T PT S E
$ %d %d %le %le %le %le %le %le %le %le
$ %le %le %le %le %le %le %le %le %le %le
#segment 1 2 20 0 start
1 0 0.000198523676 0 0.0005259618406 0 0 0 0 0
2 0 -0.00022928872 0 0.001683343822 0 0 0 0 0
Expand Down