Skip to content

Commit

Permalink
Forgout to copy some correct references.
Browse files Browse the repository at this point in the history
  • Loading branch information
tobias committed Mar 19, 2018
1 parent 2070b89 commit 6c95beb
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 63 deletions.
103 changes: 52 additions & 51 deletions tests/test-c6t-5/afterTrom.twiss.ref
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@
@ EY %le 1
@ ET %le 0.001
@ LENGTH %le 120
@ ALFA %le 0.0008337855543
@ ORBIT5 %le 0.0006407313762
@ GAMMATR %le 34.63162074
@ Q1 %le 1.416890016
@ Q2 %le 1.338126798
@ DQ1 %le -3.086474036
@ DQ2 %le -1.969744197
@ DXMAX %le 0.02698166058
@ DYMAX %le 1.279100951
@ XCOMAX %le 0.003044969894
@ YCOMAX %le 0.2144618678
@ BETXMAX %le 107.2654242
@ BETYMAX %le 61.11750854
@ XCORMS %le 0.001564436705
@ YCORMS %le 0.1259195532
@ DXRMS %le 0.01181724804
@ DYRMS %le 0.6410201932
@ ALFA %le 0.000805030598
@ ORBIT5 %le 0.0007344539463
@ GAMMATR %le 35.24469903
@ Q1 %le 1.346613813
@ Q2 %le 1.30055717
@ DQ1 %le -1.564759784
@ DQ2 %le -1.566810637
@ DXMAX %le 0.0293352885
@ DYMAX %le 1.113099445
@ XCOMAX %le 0.002907156139
@ YCOMAX %le 0.190476743
@ BETXMAX %le 34.08793922
@ BETYMAX %le 33.53118674
@ XCORMS %le 0.001728796459
@ YCORMS %le 0.1108253658
@ DXRMS %le 0.01824923054
@ DYRMS %le 0.5591484967
@ DELTAP %le 0
@ SYNCH_1 %le 0
@ SYNCH_2 %le 0
Expand All @@ -42,39 +42,40 @@
@ TITLE %08s "no-title"
@ ORIGIN %16s "5.04.00 Linux 64"
@ DATE %08s "19/03/18"
@ TIME %08s "13.30.24"
@ TIME %08s "13.47.06"
* NAME X Y BETX BETY MUX MUY PT T
$ %s %le %le %le %le %le %le %le %le
"SEQ$START" 0.001844006265 0.1092830573 55.30583843 10.86549301 0 0 0.0001820578363 -0.0006407313762
"MATLOC.BIM" 0.001749995712 0.1211221788 35.45600821 13.27137697 0.04403372671 0.2177496435 0.0001820578363 -0.0006378517778
"QFSTART" 0.001749995712 0.1211221788 35.45600821 13.27137697 0.04403372671 0.2177496435 0.0001820578363 -0.0006378517778
"DRIFT_0" 0.0002829490528 0.1692089056 2.875810389 61.10291189 0.2716365602 0.2748445045 0.0001820578363 -0.0002553423842
"QD" 0.0002829490528 0.1692089056 2.875810389 61.10291189 0.2716365602 0.2748445045 0.0001820578363 -0.0002553423842
"DRIFT_1" 0.0001695001859 0.1541299792 4.272736619 53.87252455 0.3176695976 0.277618067 0.0001820578363 -0.0003327749912
"HKICK" 0.0001695001859 0.1541299792 4.272736619 53.87252455 0.3176695976 0.277618067 0.0001820578363 -0.0003327749912
"DRIFT_2" 0.0002067980434 0.1511141939 4.655087964 52.48524594 0.3248078055 0.2782165604 0.0001820578363 -0.0003482639943
"VKICK" 0.0002067980434 0.1511141939 4.655087964 52.48524594 0.3248078055 0.2782165604 0.0001820578363 -0.0003482639943
"DRIFT_3" 0.001847903774 0.1093049009 55.45735978 10.8486122 0.4170337017 0.3383171513 0.0001820578363 -8.976418162e-06
"QF" 0.001847903774 0.1093049009 55.45735978 10.8486122 0.4170337017 0.3383171513 0.0001820578363 -8.976418162e-06
"DRIFT_4" 0.001540903309 0.1902634688 27.86624862 19.81064635 0.4579605925 0.4577584227 0.0001820578363 0.0001333833521
"QD" 0.001540903309 0.1902634688 27.86624862 19.81064635 0.4579605925 0.4577584227 0.0001820578363 0.0001333833521
"DRIFT_5" 0.003044969894 0.04760002417 94.98024664 6.637402599 0.4890882902 0.6263114857 0.0001820578363 -0.0005059363846
"QF" 0.003044969894 0.04760002417 94.98024664 6.637402599 0.4890882902 0.6263114857 0.0001820578363 -0.0005059363846
"DRIFT_6" 0.0009701976194 -0.03911777168 9.225518134 51.0723137 0.5439216139 0.7176717601 0.0001820578363 -0.0004185119776
"QD" 0.0009701976194 -0.03911777168 9.225518134 51.0723137 0.5439216139 0.7176717601 0.0001820578363 -0.0004185119776
"DRIFT_7" 3.572592695e-05 -0.07985934897 11.05736664 15.87108062 0.7712769848 0.7747793925 0.0001820578363 1.025306241e-06
"QF" 3.572592695e-05 -0.07985934897 11.05736664 15.87108062 0.7712769848 0.7747793925 0.0001820578363 1.025306241e-06
"DRIFT_8" 3.377300419e-05 -0.08012855401 11.04392349 15.90259127 0.7715649721 0.7749797121 0.0001820578363 3.981711303e-17
"RFCAV" 3.377300419e-05 -0.08012855401 11.04392349 15.90259127 0.7715649721 0.7749797121 0.0001820578363 3.981711303e-17
"DRIFT_9" -0.0009407354534 -0.2144618678 14.38328208 41.80416433 0.9169619079 0.8382219377 0.0001820578363 -0.0005116278143
"QD" -0.0009407354534 -0.2144618678 14.38328208 41.80416433 0.9169619079 0.8382219377 0.0001820578363 -0.0005116278143
"DRIFT_10" -0.003022869702 -0.09700131445 107.2654242 5.148390927 0.9579235051 0.9575576472 0.0001820578363 -0.0007797373607
"QF" -0.003022869702 -0.09700131445 107.2654242 5.148390927 0.9579235051 0.9575576472 0.0001820578363 -0.0007797373607
"DRIFT_11" -0.00155214007 -0.09354913737 24.6822091 25.5321478 0.9890464121 1.126155727 0.0001820578363 -0.0002669320672
"QD" -0.00155214007 -0.09354913737 24.6822091 25.5321478 0.9890464121 1.126155727 0.0001820578363 -0.0002669320672
"DRIFT_12" -0.001905684367 0.0198539751 35.58818047 13.25683461 1.043809709 1.217593834 0.0001820578363 -0.0004817471721
"QF" -0.001905684367 0.0198539751 35.58818047 13.25683461 1.043809709 1.217593834 0.0001820578363 -0.0004817471721
"DRIFT_13" -1.942416612e-05 0.1565920236 2.867687296 61.11750854 1.270916901 1.274714288 0.0001820578363 -0.001027368432
"QD" -1.942416612e-05 0.1565920236 2.867687296 61.11750854 1.270916901 1.274714288 0.0001820578363 -0.001027368432
"DRIFT_14" 0.001844006265 0.1092830573 55.30583928 10.86549964 1.416890016 1.338126798 0.0001820578363 -0.0006407313762
"SEQ$END" 0.001844006265 0.1092830573 55.30583928 10.86549964 1.416890016 1.338126798 0.0001820578363 -0.0006407313762
"SEQ$START" 0.002907156139 0.0967802983 33.60963339 8.655352869 0 0 0.0001609191569 -0.0007344539463
"QFSTART" 0.002907156139 0.0967802983 33.60963339 8.655352869 0 0 0.0001609191569 -0.0007344539463
"DRIFT_0" 0.0008867949516 0.1215881192 8.852676456 33.2050094 0.09840166625 0.100389192 0.0001609191569 -0.0003155567013
"QD" 0.0008867949516 0.1215881192 8.852676456 33.2050094 0.09840166625 0.100389192 0.0001609191569 -0.0003155567013
"DRIFT_1" 0.0007889888359 0.1097779652 10.03650142 29.4470908 0.1153150406 0.10547889 0.0001609191569 -0.000349161759
"HKICK" 0.0007889888359 0.1097779652 10.03650142 29.4470908 0.1153150406 0.10547889 0.0001609191569 -0.000349161759
"DRIFT_2" 0.0008294166798 0.1074159343 10.30770245 28.73025412 0.118444194 0.1065730566 0.0001609191569 -0.0003558863154
"VKICK" 0.0008294166798 0.1074159343 10.30770245 28.73025412 0.118444194 0.1065730566 0.0001609191569 -0.0003558863154
"DRIFT_3" 0.002608241813 0.09437401441 33.60444286 8.655961285 0.1968120754 0.2007742991 0.0001609191569 3.246943499e-05
"QF" 0.002608241813 0.09437401441 33.60444286 8.655961285 0.1968120754 0.2007742991 0.0001609191569 3.246943499e-05
"DRIFT_4" 0.00156402057 0.190476743 8.525230952 33.53118674 0.2973868968 0.3005934776 0.0001609191569 -3.669828138e-05
"QD" 0.00156402057 0.190476743 8.525230952 33.53118674 0.2973868968 0.3005934776 0.0001609191569 -3.669828138e-05
"DRIFT_5" 0.002358080752 0.06270143218 32.82974719 8.70774834 0.3993327476 0.4000693855 0.0001609191569 -0.0005074463556
"QF" 0.002358080752 0.06270143218 32.82974719 8.70774834 0.3993327476 0.4000693855 0.0001609191569 -0.0005074463556
"DRIFT_6" 0.0003805558724 0.008622644527 8.728233277 33.32835209 0.4998953591 0.4998944769 0.0001609191569 -0.0002193208205
"QD" 0.0003805558724 0.008622644527 8.728233277 33.32835209 0.4998953591 0.4998944769 0.0001609191569 -0.0002193208205
"DRIFT_7" -0.001149680266 -0.05559082267 34.08793922 8.623378958 0.5982984949 0.6002832773 0.0001609191569 9.932312143e-07
"QF" -0.001149680266 -0.05559082267 34.08793922 8.623378958 0.5982984949 0.6002832773 0.0001609191569 9.932312143e-07
"DRIFT_8" -0.00115003817 -0.05584992765 34.00786493 8.643709517 0.5983919668 0.6006519004 0.0001609191569 -4.975376241e-17
"RFCAV" -0.00115003817 -0.05584992765 34.00786493 8.643709517 0.5983919668 0.6006519004 0.0001609191569 -4.975376241e-17
"DRIFT_9" -0.001328632463 -0.1851433134 8.727340533 33.3302418 0.696707421 0.7006687827 0.0001609191569 -0.000495622376
"QD" -0.001328632463 -0.1851433134 8.727340533 33.3302418 0.696707421 0.7006687827 0.0001609191569 -0.000495622376
"DRIFT_10" -0.002024859956 -0.1499205659 14.94998424 20.01335588 0.7536373745 0.7254129475 0.0001609191569 -0.0004897648528
"MATLOC.BIM" -0.001557212588 -0.1389216617 14.95249968 20.01173093 0.9036403573 0.8254086282 0.0001609191569 -0.0004927995741
"DRIFT_11" -0.001671347963 -0.06249004164 32.83297588 8.707254204 0.9472753298 0.9004912889 0.0001609191569 -0.0007718527768
"QF" -0.001671347963 -0.06249004164 32.83297588 8.707254204 0.9472753298 0.9004912889 0.0001609191569 -0.0007718527768
"DRIFT_12" 0.0001028557655 -0.00855207217 8.525724207 33.5301296 1.049211916 0.9999722655 0.0001609191569 -0.0004828225376
"QD" 0.0001028557655 -0.00855207217 8.525724207 33.5301296 1.049211916 0.9999722655 0.0001609191569 -0.0004828225376
"DRIFT_13" 0.001997951666 0.05543762918 33.60229563 8.656282124 1.149787089 1.099791125 0.0001609191569 -0.0002609544761
"QF" 0.001997951666 0.05543762918 33.60229563 8.656282124 1.149787089 1.099791125 0.0001609191569 -0.0002609544761
"DRIFT_14" 0.001544742494 0.1845862971 8.851814043 33.20681727 1.248206632 1.200170914 0.0001609191569 -0.0007516629945
"QD" 0.001544742494 0.1845862971 8.851814043 33.20681727 1.248206632 1.200170914 0.0001609191569 -0.0007516629945
"DRIFT_15" 0.002907156139 0.0967802983 33.60963325 8.655318952 1.346613813 1.30055717 0.0001609191569 -0.0007344539463
"SEQ$END" 0.002907156139 0.0967802983 33.60963325 8.655318952 1.346613813 1.30055717 0.0001609191569 -0.0007344539463
2 changes: 1 addition & 1 deletion tests/test-c6t-5/beforeTromb.twiss.ref
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
@ TITLE %08s "no-title"
@ ORIGIN %16s "5.04.00 Linux 64"
@ DATE %08s "19/03/18"
@ TIME %08s "13.30.24"
@ TIME %08s "13.47.06"
* NAME BETX BETY MUX MUY PT T
$ %s %le %le %le %le %le %le
"SEQ$START" 33.60345417 8.656838685 0 0 0.0002955535518 -0.0009455828463
Expand Down
24 changes: 14 additions & 10 deletions tests/test-c6t-5/fc.2.ref
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
SINGLE ELEMENTS---------------------------------------------------------
matloc.bim 22 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
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
Expand All @@ -12,6 +11,9 @@ qf 2 -1.175570505e-01 0.000000000e+00 0.000000000e+00 0
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
NEXT
BLOCK DEFINITIONS-------------------------------------------------------
1 1
Expand All @@ -21,17 +23,19 @@ BLOC3 drift_2
BLOC4 drift_3
BLOC5 drift_8
BLOC6 drift_9
BLOC7 drift_10
BLOC8 drift_11
NEXT
STRUCTURE INPUT---------------------------------------------------------
matloc.bim qfstart BLOC1
qd BLOC2 hkick
BLOC3 vkick BLOC4
qf BLOC1 qd
BLOC1 qf BLOC1
qd BLOC1 qf
BLOC5 rfcav BLOC6
qd BLOC1 qf
qfstart BLOC1 qd
BLOC2 hkick BLOC3
vkick BLOC4 qf
BLOC1 qd BLOC1
qf BLOC1 qd
BLOC1
BLOC1 qf BLOC5
rfcav BLOC6 qd
BLOC7 matloc.bim BLOC8
qf BLOC1 qd
BLOC1 qf BLOC1
qd BLOC1
NEXT
2 changes: 1 addition & 1 deletion tests/test-c6t-5/test-c6t-5.madx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ R52LOC.BIM:=R22LOC.BIM*R16LOC.BIM-R12LOC.BIM*R26LOC.BIM;

!show, MATLOC.BIM ;
seqedit,sequence=seq;
install, element=MATLOC.BIM, at = markLOC.BIM;
install, element=MATLOC.BIM, at = 0.7 * lcell+3*lcell;
remove, element=markLOC.BIM;
endedit;

Expand Down

0 comments on commit 6c95beb

Please sign in to comment.