From ecf082a2664626fb6351927a4618919f9460d0ae Mon Sep 17 00:00:00 2001 From: tpersson Date: Mon, 22 Feb 2021 21:55:44 +0100 Subject: [PATCH 1/5] Fixed the order of tilt and misalignments. --- libs/ptc/src/Sma_multiparticle.f90 | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/libs/ptc/src/Sma_multiparticle.f90 b/libs/ptc/src/Sma_multiparticle.f90 index 51dabd57d..633ee81f1 100644 --- a/libs/ptc/src/Sma_multiparticle.f90 +++ b/libs/ptc/src/Sma_multiparticle.f90 @@ -637,15 +637,17 @@ SUBROUTINE TRACK_FIBRE_FRONTR(C,X,K) endif ENDIF - CALL DTILTD(C%MAG%P%TILTD,1,X) - ! The magnet frame of reference is located here implicitely before misalignments + ! CALL TRACK(C,X,EXACTMIS=K%EXACTMIS) IF(C%MAG%MIS) THEN ou = ALWAYS_EXACTMIS !K%EXACTMIS.or. CALL MIS_FIB(C,X,k,OU,DONEITT) ENDIF - + + ! Apply the tilt after the misalignments + CALL DTILTD(C%MAG%P%TILTD,1,X) + END SUBROUTINE TRACK_FIBRE_FRONTR SUBROUTINE TRACK_FIBRE_FRONTP(C,X,K) @@ -724,14 +726,15 @@ SUBROUTINE TRACK_FIBRE_FRONTP(C,X,K) endif ENDIF - CALL DTILTD(C%MAGP%P%TILTD,1,X) - ! The magnet frame of reference is located here implicitely before misalignments + ! CALL TRACK(C,X,EXACTMIS=K%EXACTMIS) IF(C%MAGP%MIS) THEN ou = ALWAYS_EXACTMIS !K%EXACTMIS.or. CALL MIS_FIB(C,X,k,OU,DONEITT) ENDIF + !Apply after the misalignments T.Persson + CALL DTILTD(C%MAGP%P%TILTD,1,X) END SUBROUTINE TRACK_FIBRE_FRONTP @@ -758,14 +761,15 @@ SUBROUTINE TRACK_FIBRE_BACKR(C,X,K) PATCHT=0 ; PATCHE=0 ;PATCHG=0; ENDIF - - IF(C%MAG%MIS) THEN + + ! First tilt back T.Persson + CALL DTILTD(C%MAG%P%TILTD,2,X) + IF(C%MAG%MIS) THEN ou = ALWAYS_EXACTMIS !K%EXACTMIS.or. CALL MIS_FIB(C,X,k,OU,DONEITF) ENDIF - ! The magnet frame of reference is located here implicitely before misalignments - CALL DTILTD(C%MAG%P%TILTD,2,X) - + + IF(PATCHT/=0.AND.PATCHT/=1.AND.(K%TOTALPATH==0)) THEN if(K%time) then X(6)=X(6)-C%PATCH%b_T !/c%beta0 @@ -841,14 +845,16 @@ SUBROUTINE TRACK_FIBRE_BACKP(C,X,K) PATCHT=0 ; PATCHE=0 ;PATCHG=0; ENDIF + ! First tilt back T. Persson + CALL DTILTD(C%MAGP%P%TILTD,2,X) + IF(C%MAGP%MIS) THEN ou = ALWAYS_EXACTMIS !K%EXACTMIS.or. CALL MIS_FIB(C,X,k,OU,DONEITF) ENDIF - ! The magnet frame of reference is located here implicitely before misalignments - CALL DTILTD(C%MAGP%P%TILTD,2,X) + IF(PATCHT/=0.AND.PATCHT/=1.AND.(K%TOTALPATH==0)) THEN if(K%time) then From 53711017cc12d46740a7633ed5c34a6ed85a27e0 Mon Sep 17 00:00:00 2001 From: tpersson Date: Tue, 23 Feb 2021 17:00:54 +0100 Subject: [PATCH 2/5] Fixes the problem with the rotation. --- src/twiss.f90 | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/twiss.f90 b/src/twiss.f90 index 8c6ff2047..338546b43 100644 --- a/src/twiss.f90 +++ b/src/twiss.f90 @@ -2045,7 +2045,6 @@ SUBROUTINE twcptk(re,orbit) eflag = 0 call element_name(name,len(name)) - !---- Dispersion. DT = matmul(RE, DISP) @@ -2269,7 +2268,7 @@ SUBROUTINE twcptk_twiss(matx, maty, error) double precision :: maty11, maty12, maty21, maty22 double precision :: alfx_ini, betx_ini, tempa double precision :: alfy_ini, bety_ini, tempb - double precision :: detx, dety + double precision :: detx, dety, atanm12 logical :: error double precision, parameter :: eps=1d-36 character(len=name_len) :: name @@ -2307,10 +2306,12 @@ SUBROUTINE twcptk_twiss(matx, maty, error) betx = (tempb * tempb + matx12 * matx12) / (detx*betx_ini) !if (abs(matx12).gt.eps) amux = amux + atan2(matx12,tempb) if (abs(matx12).gt.eps) then - amux = amux + atan2(matx12,tempb) - - if (atan2(matx12,tempb) .lt. zero)then - if (ele_body .and. abs(atan2(matx12,tempb)) > 0.1) then + atanm12 = atan2(matx12,tempb) + if(abs(atanm12) < 3.14 .or. ele_body) then + amux = amux + atanm12 + endif + if (atanm12 .lt. zero)then + if (ele_body .and. abs(atanm12) > 0.1) then write (warnstr,'(a,e13.6,a,a)') "Negative phase advance in x-plane ", & atan2(matx12,tempb), " in the element ", name call fort_warn('TWCPTK_TWISS: ', warnstr) @@ -2332,12 +2333,15 @@ SUBROUTINE twcptk_twiss(matx, maty, error) bety = (tempb * tempb + maty12 * maty12) / (detx*bety_ini) ! if (abs(maty12).gt.eps) amuy = amuy + atan2(maty12,tempb) if (abs(maty12).gt.eps) then - amuy = amuy + atan2(maty12,tempb) + atanm12 = atan2(maty12,tempb) + if(abs(atanm12) < 3.14 .or. ele_body) then ! If no body phase advance < 180 deg + amuy = amuy + atanm12 + endif if (atan2(maty12,tempb) .lt. zero) then - if (ele_body .and. abs(atan2(maty12,tempb)) > 0.1 ) then + if (ele_body .and. abs(atanm12) > 0.1 ) then write (warnstr,'(a,e13.6,a,a)') "Negative phase advance in y-plane ", & - atan2(maty12,tempb), " in the element ", name + atanm12, " in the element ", name call fort_warn('TWCPTK_TWISS: ', warnstr) ! print*, " maty12 =", maty12, " tempb = ", tempb , "maty11 * bety_ini =", maty11 * bety_ini, & ! " maty12 * alfy_ini = ", maty12 * alfy_ini @@ -6683,7 +6687,6 @@ SUBROUTINE tmsrot(ftrk,orbit,fmap,ek,re,te) re(4,2) = -st re(4,4) = ct - !---- Track orbit. if (ftrk) call tmtrak(ek,re,te,orbit,orbit) @@ -7630,6 +7633,7 @@ SUBROUTINE tmali2(el, orb1, errors, beta, gamma, orb2, rm) orbt(4) = orb1(4) - w(3,2) orbt(5) = orb1(5) - s2 / beta orbt(6) = orb1(6) + ORB2 = matmul(RM,ORBT) end SUBROUTINE tmali2 From f1c8aa79fbf91c6f80b74f226a0767d69580b3b8 Mon Sep 17 00:00:00 2001 From: tpersson Date: Tue, 23 Feb 2021 17:18:01 +0100 Subject: [PATCH 3/5] Fixes the problem with tilts in Sm_tracking as well. --- libs/ptc/src/Sm_tracking.f90 | 20 ++++-- tests/test-crabcavity/fodo.ptc | 125 --------------------------------- 2 files changed, 13 insertions(+), 132 deletions(-) delete mode 100644 tests/test-crabcavity/fodo.ptc diff --git a/libs/ptc/src/Sm_tracking.f90 b/libs/ptc/src/Sm_tracking.f90 index e8f958b51..fb4a5c075 100644 --- a/libs/ptc/src/Sm_tracking.f90 +++ b/libs/ptc/src/Sm_tracking.f90 @@ -510,7 +510,7 @@ SUBROUTINE TRACK_FIBRE_R(C,X,K,X_IN) ENDIF IF(PRESENT(X_IN)) CALL XMID(X_IN,X,-3) - CALL DTILTD(C%MAG%P%TILTD,1,X) + IF(PRESENT(X_IN)) CALL XMID(X_IN,X,-2) ! The magnet frame of reference is located here implicitely before misalignments @@ -519,6 +519,8 @@ SUBROUTINE TRACK_FIBRE_R(C,X,K,X_IN) ou = ALWAYS_EXACTMIS !K%EXACTMIS.or. CALL MIS_FIB(C,X,k,OU,DONEITT) ENDIF + CALL DTILTD(C%MAG%P%TILTD,1,X) + IF(PRESENT(X_IN)) then CALL XMID(X_IN,X,-1) X_IN%POS(2)=X_IN%nst @@ -532,12 +534,12 @@ SUBROUTINE TRACK_FIBRE_R(C,X,K,X_IN) X_IN%POS(3)=X_IN%nst endif + CALL DTILTD(C%MAG%P%TILTD,2,X) IF(C%MAG%MIS) THEN CALL MIS_FIB(C,X,k,OU,DONEITF) ENDIF IF(PRESENT(X_IN)) CALL XMID(X_IN,X,X_IN%nst+1) - ! The magnet frame of reference is located here implicitely before misalignments - CALL DTILTD(C%MAG%P%TILTD,2,X) + IF(PRESENT(X_IN)) CALL XMID(X_IN,X,X_IN%nst+1) IF(PATCHT/=0.AND.PATCHT/=1.AND.(K%TOTALPATH==0)) THEN @@ -700,13 +702,14 @@ SUBROUTINE TRACK_FIBRE_P(C,X,K) ENDIF ! IF(PRESENT(X_IN)) CALL XMID(X_IN,X,-3) - CALL DTILTD(C%MAGP%P%TILTD,1,X) - ! IF(PRESENT(X_IN)) CALL XMID(X_IN,X,-2) + ! IF(PRESENT(X_IN)) CALL XMID(X_IN,X,-2) ! MISALIGNMENTS AT THE ENTRANCE IF(C%MAGP%MIS) THEN OU =ALWAYS_EXACTMIS ! K%EXACTMIS.OR. CALL MIS_FIB(C,X,k,OU,DONEITT) ENDIF + ! Apply tilt after misalignments + CALL DTILTD(C%MAGP%P%TILTD,1,X) CALL TRACK(C%MAGP,X,K) ! if(abs(x(1))+abs(x(3))>absolute_aperture.or.(.not.CHECK_MADX_APERTURE)) then ! new 2010 @@ -716,13 +719,16 @@ SUBROUTINE TRACK_FIBRE_P(C,X,K) - ! MISALIGNMENTS AT THE EXIT + + CALL DTILTD(C%MAGP%P%TILTD,2,X) + ! Tilt back before misalignment + IF(C%MAGP%MIS) THEN CALL MIS_FIB(C,X,k,OU,DONEITF) ENDIF ! IF(PRESENT(X_IN)) CALL XMID(X_IN,X,X_IN%nst+1) - CALL DTILTD(C%MAGP%P%TILTD,2,X) + ! IF(PRESENT(X_IN)) CALL XMID(X_IN,X,X_IN%nst+1) !EXIT PATCH diff --git a/tests/test-crabcavity/fodo.ptc b/tests/test-crabcavity/fodo.ptc deleted file mode 100644 index 1a05f1497..000000000 --- a/tests/test-crabcavity/fodo.ptc +++ /dev/null @@ -1,125 +0,0 @@ -@ NAME %09s "PTC_TWISS" -@ TYPE %05s "TWISS" -@ SEQUENCE %03s "SEQ" -@ PARTICLE %06s "PROTON" -@ MASS %le 0.9382720882 -@ CHARGE %le 1 -@ ENERGY %le 2 -@ PC %le 1.766251819 -@ GAMMA %le 2.13157785 -@ KBUNCH %le 1 -@ BCURRENT %le 3.121728315e-13 -@ SIGE %le 0.001 -@ SIGT %le 1 -@ NPART %le 1 -@ EX %le 1 -@ EY %le 1 -@ ET %le 0.001 -@ DELTAP %le 0 -@ LENGTH %le 120 -@ ALPHA_C %le -1000000 -@ ALPHA_C_P %le -1000000 -@ ALPHA_C_P2 %le -1000000 -@ ALPHA_C_P3 %le -1000000 -@ ETA_C %le -1000000 -@ GAMMA_TR %le -1000000 -@ Q1 %le 1.253608706 -@ Q2 %le 1.238997081 -@ DQ1 %le -1000000 -@ DQ2 %le -1000000 -@ QS %le -1000000 -@ BETA_X_MIN %le 1 -@ BETA_X_MAX %le 446.7981659 -@ BETA_Y_MIN %le 1 -@ BETA_Y_MAX %le 703.7031576 -@ BETA11MIN %le 1 -@ BETA11MAX %le 446.7981659 -@ BETA12MIN %le 0 -@ BETA12MAX %le 0.01033412979 -@ BETA13MIN %le 0 -@ BETA13MAX %le 217.6458172 -@ BETA21MIN %le 0 -@ BETA21MAX %le 0.002662978516 -@ BETA22MIN %le 1 -@ BETA22MAX %le 703.7031576 -@ BETA23MIN %le 0 -@ BETA23MAX %le 0.06881893912 -@ BETA31MIN %le 0 -@ BETA31MAX %le 25.30066035 -@ BETA32MIN %le 0 -@ BETA32MAX %le 0.03907020442 -@ BETA33MIN %le 1 -@ BETA33MAX %le 690.1324244 -@ DISP1MIN %le -0.01222928677 -@ DISP1MAX %le 5.008519498 -@ DISP2MIN %le -0.2905091549 -@ DISP2MAX %le 0.2681715736 -@ DISP3MIN %le -0.2744543842 -@ DISP3MAX %le 0.1783970582 -@ DISP4MIN %le -0.01677194386 -@ DISP4MAX %le 0.01633726791 -@ ORBIT_X %le 0 -@ ORBIT_PX %le 0 -@ ORBIT_Y %le 0 -@ ORBIT_PY %le 0 -@ ORBIT_PT %le 0 -@ ORBIT_T %le 0 -@ XCORMS %le 0.01064660039 -@ PXCORMS %le 0.0009350604313 -@ YCORMS %le 0.01842426956 -@ PYCORMS %le 0.001680751517 -@ TCORMS %le 0.00157915113 -@ PTCORMS %le 0.0002350173024 -@ XCOMIN %le -0.01982977494 -@ XCOMAX %le 0.02128545168 -@ PXCOMIN %le -0.001432698819 -@ PXCOMAX %le 0.001335758666 -@ YCOMIN %le -0.03973946574 -@ YCOMAX %le 0.03876287719 -@ PYCOMIN %le -0.002473957299 -@ PYCOMAX %le 0.002705887719 -@ TCOMIN %le -0.0001614699198 -@ TCOMAX %le 0.004897828723 -@ PTCOMIN %le 0 -@ PTCOMAX %le 0.0004634515107 -@ TITLE %08s "no-title" -@ ORIGIN %16s "5.06.01 Linux 64" -@ DATE %08s "19/02/21" -@ TIME %08s "09.37.28" -* NAME S X Y PT T RE11 RE12 RE15 RE25 RE56 -$ %s %le %le %le %le %le %le %le %le %le %le - "SEQ$START" 0 0 0 0 -0 1 0 0 0 0 - "DRIFT_0" 4 0 0 0 -0 1 4 0 0 -1.128787889 - "QFSTART" 4 0 0 0 -0 1 4 0 0 -1.128787889 - "DRIFT_1" 10 0 0 0 8.881784197e-16 0.3087645433 7.235058173 0 0 -2.821969723 - "QD" 10 0 0 0 8.881784197e-16 0.3087645433 7.235058173 0 0 -2.821969723 - "DRIFT_2" 11 0 0 0 8.881784197e-16 0.2298560829 8.624766634 0 0 -3.104166695 - "HKICK" 11 0 0 0 8.881784197e-16 0.2298560829 8.624766634 0 0 -3.104166695 - "DRIFT_3" 11.2 0.00024 0 0 -1.63057156e-07 0.2140743908 8.902708326 0 0 -3.160606499 - "VKICK" 11.2 0.00024 0 0 -1.63057156e-07 0.2140743908 8.902708326 0 0 -3.160606499 - "DRIFT_4" 20 0.0108 0.011704 0 -1.61507661e-05 -0.4803200612 21.13214278 0 0 -5.643980047 - "QF" 20 0.0108 0.011704 0 -1.61507661e-05 -0.4803200612 21.13214278 0 0 -5.643980047 - "DRIFT_5" 30 0.01010383855 0.03876287719 0 -5.763225064e-05 -0.704754569 10.18690364 0 0 -8.466102919 - "QD" 30 0.01010383855 0.03876287719 0 -5.763225064e-05 -0.704754569 10.18690364 0 0 -8.466102919 - "DRIFT_6" 40 0.02128545168 0.02025325928 0 -8.410834098e-05 -1.757677761 11.21708794 0 0 -11.28823051 - "QF" 40 0.02128545168 0.02025325928 0 -8.410834098e-05 -1.757677761 11.21708794 0 0 -11.28823051 - "DRIFT_7" 50 0.007444515641 0.0255527756 0 -9.654464147e-05 -0.7443268207 -0.9392054847 0 0 -14.11020074 - "QD" 50 0.007444515641 0.0255527756 0 -9.654464147e-05 -0.7443268207 -0.9392054847 0 0 -14.11020074 - "DRIFT_8" 60 0.002355132607 0.0008132026174 0 -0.0001326634035 -0.6059845364 -14.19960118 0 0 -16.93221957 - "QF" 60 0.002355132607 0.0008132026174 0 -0.0001326634035 -0.6059845364 -14.19960118 0 0 -16.93221957 - "DRIFT_9" 60.02 0.002339416592 0.0007656354254 0 -0.0001327344475 -0.6042830968 -14.19273671 0 0 -16.93786401 - "RFCAV" 60.02 0.002339416592 0.0007656354254 3.509729285e-06 -0.0001327344475 -0.6042830968 -14.19273671 0 0 -16.93786401 - "DRIFT_10" 70 -0.005502843688 -0.02297029902 3.509729285e-06 -0.0001583005943 0.2447309935 -10.7673674 0.0002348045122 0 -18.49304347 - "QD" 70 -0.005502843688 -0.02297029902 3.509729285e-06 -0.0001583005943 0.2447309935 -10.7673674 0.0002348045122 2.760292589e-05 -18.49304347 - "DRIFT_11" 80 -0.01982977494 -0.01975070178 3.509729285e-06 -0.0001606044482 1.383143144 -19.99287396 0.0009397942215 2.760292589e-05 -20.05117806 - "QF" 80 -0.01982977494 -0.01975070178 3.509729285e-06 -0.0001606044482 1.383143144 -19.99287396 0.0009397942215 -8.287651083e-05 -20.05117806 - "DRIFT_12" 80.5 -0.01938056121 -0.02075063443 3.509729285e-06 -0.0001614699198 1.358765098 -19.27900391 0.000884906257 -8.287651083e-05 -20.12907766 - "CRAB" 80.5 -0.01938056121 -0.02075063443 0.0004634515107 -0.0001614699198 1.358765098 -19.27900391 0.000884906257 0.0200225165 -20.12907766 - "DRIFT_13" 90 -0.01081355774 -0.03973946574 0.0004634515107 0.00105414635 0.8947899207 -5.71536631 0.1907429148 0.0200225165 -21.60945529 - "QD" 90 -0.01081355774 -0.03973946574 0.0004634515107 0.00105414635 0.8947899207 -5.71536631 0.1907429148 0.04244569097 -21.60945529 - "DRIFT_14" 100 -0.01450109164 -0.01303566732 0.0004634515107 0.002319825381 1.457266812 1.853450458 0.6150874547 0.04244569097 -23.15892966 - "QF" 100 -0.01450109164 -0.01303566732 0.0004634515107 0.002319825381 1.457266812 1.853450458 0.6150874547 -0.02986217598 -23.15892966 - "DRIFT_15" 110 -0.00115051076 -0.001648177592 0.0004634515107 0.003609211648 0.308146062 7.235703437 0.3162231625 -0.02986217598 -24.70189032 - "QD" 110 -0.00115051076 -0.001648177592 0.0004634515107 0.003609211648 0.308146062 7.235703437 0.3162231625 0.007312086291 -24.70189032 - "DRIFT_16" 120 0.01084827297 0.01167584489 0.0004634515107 0.004897828723 -0.4789667451 21.12027644 0.3889469374 0.007312086291 -26.25766314 - "SEQ$END" 120 0.01084827297 0.01167584489 0.0004634515107 0.004897828723 -0.4789667451 21.12027644 0.3889469374 0.007312086291 -26.25766314 From 95595e97d0b274b5fdfe426e6079b0832db3fccc Mon Sep 17 00:00:00 2001 From: tpersson Date: Mon, 1 Mar 2021 15:57:29 +0100 Subject: [PATCH 4/5] Added test. --- Makefile_test | 2 +- .../test-ptc-twiss-tilt.cfg | 3 + .../test-ptc-twiss-tilt.madx | 27 +++ .../test-ptc-twiss-tilt.ref | 229 ++++++++++++++++++ .../track.simple.obs0001.p0001.cfg | 2 + .../track.simple.obs0001.p0001.ref | 10 + tests/test-ptc-twiss-tilt/twiss.madx.simple | 53 ++++ .../test-ptc-twiss-tilt/twiss.madx.simple.cfg | 1 + .../test-ptc-twiss-tilt/twiss.madx.simple.ref | 53 ++++ tests/test-ptc-twiss-tilt/twiss.ptc.simple | 95 ++++++++ .../test-ptc-twiss-tilt/twiss.ptc.simple.cfg | 5 + .../test-ptc-twiss-tilt/twiss.ptc.simple.ref | 95 ++++++++ 12 files changed, 574 insertions(+), 1 deletion(-) create mode 100644 tests/test-ptc-twiss-tilt/test-ptc-twiss-tilt.cfg create mode 100644 tests/test-ptc-twiss-tilt/test-ptc-twiss-tilt.madx create mode 100644 tests/test-ptc-twiss-tilt/test-ptc-twiss-tilt.ref create mode 100644 tests/test-ptc-twiss-tilt/track.simple.obs0001.p0001.cfg create mode 100644 tests/test-ptc-twiss-tilt/track.simple.obs0001.p0001.ref create mode 100644 tests/test-ptc-twiss-tilt/twiss.madx.simple create mode 100644 tests/test-ptc-twiss-tilt/twiss.madx.simple.cfg create mode 100644 tests/test-ptc-twiss-tilt/twiss.madx.simple.ref create mode 100644 tests/test-ptc-twiss-tilt/twiss.ptc.simple create mode 100644 tests/test-ptc-twiss-tilt/twiss.ptc.simple.cfg create mode 100644 tests/test-ptc-twiss-tilt/twiss.ptc.simple.ref diff --git a/Makefile_test b/Makefile_test index dbe9e53e1..4c055a9a0 100644 --- a/Makefile_test +++ b/Makefile_test @@ -76,7 +76,7 @@ test-rfmultipole-ptc-1 \ 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 \ test-ptc-twiss-5D test-ptc-twiss-5Dt test-ptc-twiss-56D test-ptc-twiss-56Dt test-ptc-twiss-56Dl test-ptc-twiss-56Dtl test-ptc-twiss-6D test-ptc-twiss-6D-ALS \ -test-ptc-twiss-accel-56D test-ptc-twiss-56Dt-ini_map_man test-ptc-twiss-56Dt-ini_mtx_man test-ptc-twiss-56Dt-ini_mtx_tbl \ +test-ptc-twiss-accel-56D test-ptc-twiss-56Dt-ini_map_man test-ptc-twiss-56Dt-ini_mtx_man test-ptc-twiss-56Dt-ini_mtx_tbl test-ptc-twiss-tilt \ test-ptc-normal test-ptc-normal-5D-beambeam \ test-ptc-twiss-normal-genfu test-ptc-twiss-normal-5D test-ptc-twiss-normal-6D test-ptc-twiss-maptable \ test-ptc-track test-ptc-track-2 test-ptc-track-3 test-ptc-track-4 test-ptc-track-5 \ diff --git a/tests/test-ptc-twiss-tilt/test-ptc-twiss-tilt.cfg b/tests/test-ptc-twiss-tilt/test-ptc-twiss-tilt.cfg new file mode 100644 index 000000000..111940707 --- /dev/null +++ b/tests/test-ptc-twiss-tilt/test-ptc-twiss-tilt.cfg @@ -0,0 +1,3 @@ +1-7 * skip # head +* * abs=1e-13 +871 4 abs=4e-13 # disp1max in summ of ptc_twiss diff --git a/tests/test-ptc-twiss-tilt/test-ptc-twiss-tilt.madx b/tests/test-ptc-twiss-tilt/test-ptc-twiss-tilt.madx new file mode 100644 index 000000000..c8add2dc1 --- /dev/null +++ b/tests/test-ptc-twiss-tilt/test-ptc-twiss-tilt.madx @@ -0,0 +1,27 @@ + +FASER : SEQUENCE, L = 10; +b1:quadrupole, k1=0.2, at=5,l=1,TILT=1.0*pi/4; +endsequence; + +beam; +use, sequence=faser; +x0=0.00; +eoption, add=true; +select, flag=error, clear=true; +select, flag=error, class=b1; +ealign, dx= 0.001, dy= 0.00, ds=0.00,dphi=0.00, dtheta=0.00, dpsi=0.00; + +select, flag=twiss, column=name,s,x,px,y, py; +twiss, betx=1, bety=1, x=x0, file="twiss.madx.simple"; + +select, flag=ptc_twiss, column=name,s,x,px,y, py; +ptc_create_universe; +ptc_create_layout, model=1, method=6,nst=1, exact; +ptc_align; +ptc_start, x=x0; +!ptc_observe, place=b1; +ptc_track, icase=6, element_by_element, dump, file="track.simple", ffile=1, maxaper={100.0, 100.0, 100.0, 100.0, 100.0, 100.0}; +ptc_twiss, file="twiss.ptc.simple",betx=1,bety=1,betz=1, x=x0; +ptc_track_end; + +ptc_end; \ No newline at end of file diff --git a/tests/test-ptc-twiss-tilt/test-ptc-twiss-tilt.ref b/tests/test-ptc-twiss-tilt/test-ptc-twiss-tilt.ref new file mode 100644 index 000000000..98ea6896f --- /dev/null +++ b/tests/test-ptc-twiss-tilt/test-ptc-twiss-tilt.ref @@ -0,0 +1,229 @@ + + ++++++++++++++++++++++++++++++++++++++++++++ + + MAD-X 5.06.01 (64 bit, Linux) + + + Support: mad@cern.ch, http://cern.ch/mad + + + Release date: 2020.09.01 + + + Execution date: 2021.03.01 15:55:01 + + ++++++++++++++++++++++++++++++++++++++++++++ + + +FASER : SEQUENCE, L = 10; + +b1:quadrupole, k1=0.2, at=5,l=1,TILT=1.0*pi/4; + +endsequence; + + + +beam; + +use, sequence=faser; + +x0=0.00; + +eoption, add=true; + +select, flag=error, clear=true; + +select, flag=error, class=b1; + +ealign, dx= 0.001, dy= 0.00, ds=0.00,dphi=0.00, dtheta=0.00, dpsi=0.00; + +Assigned alignment errors to 1 elements + + +select, flag=twiss, column=name,s,x,px,y, py; + +twiss, betx=1, bety=1, x=x0, file="twiss.madx.simple"; + +enter Twiss module + Found 1 initial orbit vector values from twiss command. + +open line - error with deltap: 0.000000E+00 +initial orbit vector: 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 +final orbit vector: -3.166813E-05 -6.666984E-06 1.000311E-03 2.000667E-04 -9.683178E-08 0.000000E+00 + +++++++ table: summ + + length orbit5 alfa gammatr + 10 -0 0 0 + + q1 dq1 betxmax dxmax + 0.2338790466 0 104.4418501 6.333921466e-05 + + dxrms xcomax xcorms q2 + 4.008696646e-05 3.166813493e-05 2.004255198e-05 0.2338790466 + + dq2 betymax dymax dyrms + 0 104.4418501 0.001000933484 0.0006346246687 + + ycomax ycorms deltap synch_1 + 0.001000311115 0.0006342313264 0 0 + + synch_2 synch_3 synch_4 synch_5 + 0 0 0 0 + + synch_6 synch_8 nflips + 0 0 0 + + +select, flag=ptc_twiss, column=name,s,x,px,y, py; + +ptc_create_universe; + +Determined SECTOR NMUL MAX : 0 +ptc_create_layout, model=1, method=6,nst=1, exact; + + MAD-X Beam Parameters + Energy : 0.100000E+01 + Kinetic Energy : 0.999489E+00 + Particle Rest Mass : 0.510999E-03 + Momentum : 0.100000E+01 + Setting MADx with + energy 1.0000000000000000 + method 6 + Num. of steps 1 + charge 1.0000000000000000 + Length of machine: 10.000000000000000 + The machine is a RING + ------------------------------------ PTC Survey ------------------------------------ + Before start: 0.0000000000000000 0.0000000000000000 0.0000000000000000 + Before end: 0.0000000000000000 0.0000000000000000 0.0000000000000000 + After start: 0.0000000000000000 0.0000000000000000 0.0000000000000000 + After end: 0.0000000000000000 0.0000000000000000 10.000000000000000 +ptc_align; + +ptc_start, x=x0; + +!ptc_observe, place=b1; + +ptc_track, icase=6, element_by_element, dump, file="track.simple", ffile=1, maxaper={100.0, 100.0, 100.0, 100.0, 100.0, 100.0}; + +++++++ warning: my_state: no cavity - dimensionality reduced 6 -> 5 and 1/2 + ************ State Summary **************** + MADTHICK=>KIND = 32 DRIFT-KICK-DRIFT + Rectangular Bend: input arc length (rho alpha) + Default integration method 6 + Default integration steps 1 + This is an electron (positron actually if charge=1) + EXACT_MODEL = TRUE + TOTALPATH = 0 + RADIATION = FALSE + STOCHASTIC = FALSE + ENVELOPE = FALSE + NOCAVITY = TRUE + TIME = TRUE + FRINGE = FALSE + PARA_IN = FALSE + ONLY_2D = FALSE + ONLY_4D = FALSE + DELTA = FALSE + SPIN = FALSE + MODULATION = FALSE + RAMPING = FALSE + ACCELERATE = FALSE + +++++++ table: tracksumm + + number turn x px + 1 0 0 0 + 1 1 -3.16207568e-05 -6.657794469e-06 + + y py t pt + 0 0 -0 0 + 0.001000308811 0.0002000661896 -9.684478997e-08 0 + + s e + 0 1 + 0 1 +ptc_twiss, file="twiss.ptc.simple",betx=1,bety=1,betz=1, x=x0; + + ************ State Summary **************** + MADTHICK=>KIND = 32 DRIFT-KICK-DRIFT + Rectangular Bend: input arc length (rho alpha) + Default integration method 6 + Default integration steps 1 + This is an electron (positron actually if charge=1) + EXACT_MODEL = TRUE + TOTALPATH = 0 + RADIATION = FALSE + STOCHASTIC = FALSE + ENVELOPE = FALSE + NOCAVITY = TRUE + TIME = TRUE + FRINGE = FALSE + PARA_IN = FALSE + ONLY_2D = FALSE + ONLY_4D = TRUE + DELTA = FALSE + SPIN = FALSE + MODULATION = FALSE + RAMPING = FALSE + ACCELERATE = FALSE + Closed orbit: 0.0000000000000000 0.0000000000000000 0.0000000000000000 0.0000000000000000 + Reduced SUMM Table (Inital parameters specified) + +++++++ table: ptc_twiss_summary + + length alpha_c alpha_c_p alpha_c_p2 + 10 -1000000 -1000000 -1000000 + + alpha_c_p3 eta_c gamma_tr q1 + -1000000 -1000000 -1000000 0.2338793977 + + q2 dq1 dq2 qs + 0.233879398 -1000000 -1000000 -1000000 + + beta_x_min beta_x_max beta_y_min beta_y_max + 1 104.4371868 1 104.4371908 + + beta11min beta11max beta12min beta12max + 1 104.0887016 0 25.84844449 + + beta13min beta13max beta21min beta21max + 0 0 0 25.84844642 + + beta22min beta22max beta23min beta23max + 1 104.0887056 0 0 + + beta31min beta31max beta32min beta32max + 0 0 0 0 + + beta33min beta33max disp1min disp1max + 0 0 0 0 + + disp2min disp2max disp3min disp3max + 0 0 0 0 + + disp4min disp4max deltap orbit_x + 0 0 0 0 + + orbit_px orbit_y orbit_py orbit_pt + 0 0 0 0 + + orbit_t xcorms ycorms pxcorms + 0 2.001250801e-05 0.0006342298672 5.157105421e-06 + + pycorms tcorms ptcorms xcomax + 0.0001549706041 0 0 0 + + ycomax pxcomax pycomax tcomax + 0.001000308811 0 0.0002000661896 -0 + + ptcomax xcomin ycomin pxcomin + 0 -3.16207568e-05 0 -6.657794469e-06 + + pycomin tcomin ptcomin + 0 -0 0 +ptc_track_end; + + + +ptc_end; + + Number of warnings: 1 +0 in C and 1 in Fortran + + ++++++++++++++++++++++++++++++++++++++++++++ + + MAD-X finished normally + + ++++++++++++++++++++++++++++++++++++++++++++ diff --git a/tests/test-ptc-twiss-tilt/track.simple.obs0001.p0001.cfg b/tests/test-ptc-twiss-tilt/track.simple.obs0001.p0001.cfg new file mode 100644 index 000000000..f2a8d3ac3 --- /dev/null +++ b/tests/test-ptc-twiss-tilt/track.simple.obs0001.p0001.cfg @@ -0,0 +1,2 @@ +4-6 * skip # header +* * any abs=2e-13 rel=1e-8 diff --git a/tests/test-ptc-twiss-tilt/track.simple.obs0001.p0001.ref b/tests/test-ptc-twiss-tilt/track.simple.obs0001.p0001.ref new file mode 100644 index 000000000..2a74e18a6 --- /dev/null +++ b/tests/test-ptc-twiss-tilt/track.simple.obs0001.p0001.ref @@ -0,0 +1,10 @@ +@ NAME %19s "TRACK.OBS0001.P0001" +@ TYPE %08s "TRACKOBS" +@ TITLE %08s "no-title" +@ ORIGIN %16s "5.06.01 Linux 64" +@ DATE %08s "01/03/21" +@ TIME %08s "15.55.31" +* NUMBER TURN X PX Y PY T PT S E +$ %d %d %le %le %le %le %le %le %le %le + 1 0 0 0 0 0 -0 0 0 1 + 1 1 -3.16207568e-05 -6.657794469e-06 0.001000308811 0.0002000661896 -9.684478997e-08 0 0 1 diff --git a/tests/test-ptc-twiss-tilt/twiss.madx.simple b/tests/test-ptc-twiss-tilt/twiss.madx.simple new file mode 100644 index 000000000..d5d9ed5d6 --- /dev/null +++ b/tests/test-ptc-twiss-tilt/twiss.madx.simple @@ -0,0 +1,53 @@ +@ NAME %05s "TWISS" +@ TYPE %05s "TWISS" +@ SEQUENCE %05s "FASER" +@ PARTICLE %08s "POSITRON" +@ MASS %le 0.00051099895 +@ CHARGE %le 1 +@ ENERGY %le 1 +@ PC %le 0.9999998694 +@ GAMMA %le 1956.951184 +@ KBUNCH %le 1 +@ BCURRENT %le 4.803203458e-12 +@ SIGE %le 0.001 +@ SIGT %le 1 +@ NPART %le 1 +@ EX %le 1 +@ EY %le 1 +@ ET %le 0.001 +@ BV_FLAG %le 1 +@ LENGTH %le 10 +@ ALFA %le 0 +@ ORBIT5 %le -0 +@ GAMMATR %le 0 +@ Q1 %le 0.2338790466 +@ Q2 %le 0.2338790466 +@ DQ1 %le 0 +@ DQ2 %le 0 +@ DXMAX %le 6.333921466e-05 +@ DYMAX %le 0.001000933484 +@ XCOMAX %le 3.166813493e-05 +@ YCOMAX %le 0.001000311115 +@ BETXMAX %le 104.4418501 +@ BETYMAX %le 104.4418501 +@ XCORMS %le 2.004255198e-05 +@ YCORMS %le 0.0006342313264 +@ DXRMS %le 4.008696646e-05 +@ DYRMS %le 0.0006346246687 +@ DELTAP %le 0 +@ SYNCH_1 %le 0 +@ SYNCH_2 %le 0 +@ SYNCH_3 %le 0 +@ SYNCH_4 %le 0 +@ SYNCH_5 %le 0 +@ TITLE %08s "no-title" +@ ORIGIN %16s "5.06.01 Linux 64" +@ DATE %08s "01/03/21" +@ TIME %08s "15.56.14" +* NAME S X PX Y PY +$ %s %le %le %le %le %le + "FASER$START" 0 0 0 0 0 + "DRIFT_0" 4.5 0 0 0 0 + "B1" 5.5 -1.666706349e-06 -6.666984129e-06 0.0001000111112 0.0002000666675 + "DRIFT_1" 10 -3.166813493e-05 -6.666984129e-06 0.001000311115 0.0002000666675 + "FASER$END" 10 -3.166813493e-05 -6.666984129e-06 0.001000311115 0.0002000666675 diff --git a/tests/test-ptc-twiss-tilt/twiss.madx.simple.cfg b/tests/test-ptc-twiss-tilt/twiss.madx.simple.cfg new file mode 100644 index 000000000..ab05998b1 --- /dev/null +++ b/tests/test-ptc-twiss-tilt/twiss.madx.simple.cfg @@ -0,0 +1 @@ +44-48 * skip # date, version, .. diff --git a/tests/test-ptc-twiss-tilt/twiss.madx.simple.ref b/tests/test-ptc-twiss-tilt/twiss.madx.simple.ref new file mode 100644 index 000000000..b1df379a1 --- /dev/null +++ b/tests/test-ptc-twiss-tilt/twiss.madx.simple.ref @@ -0,0 +1,53 @@ +@ NAME %05s "TWISS" +@ TYPE %05s "TWISS" +@ SEQUENCE %05s "FASER" +@ PARTICLE %08s "POSITRON" +@ MASS %le 0.00051099895 +@ CHARGE %le 1 +@ ENERGY %le 1 +@ PC %le 0.9999998694 +@ GAMMA %le 1956.951184 +@ KBUNCH %le 1 +@ BCURRENT %le 4.803203458e-12 +@ SIGE %le 0.001 +@ SIGT %le 1 +@ NPART %le 1 +@ EX %le 1 +@ EY %le 1 +@ ET %le 0.001 +@ BV_FLAG %le 1 +@ LENGTH %le 10 +@ ALFA %le 0 +@ ORBIT5 %le -0 +@ GAMMATR %le 0 +@ Q1 %le 0.2338790466 +@ Q2 %le 0.2338790466 +@ DQ1 %le 0 +@ DQ2 %le 0 +@ DXMAX %le 6.333921466e-05 +@ DYMAX %le 0.001000933484 +@ XCOMAX %le 3.166813493e-05 +@ YCOMAX %le 0.001000311115 +@ BETXMAX %le 104.4418501 +@ BETYMAX %le 104.4418501 +@ XCORMS %le 2.004255198e-05 +@ YCORMS %le 0.0006342313264 +@ DXRMS %le 4.008696646e-05 +@ DYRMS %le 0.0006346246687 +@ DELTAP %le 0 +@ SYNCH_1 %le 0 +@ SYNCH_2 %le 0 +@ SYNCH_3 %le 0 +@ SYNCH_4 %le 0 +@ SYNCH_5 %le 0 +@ TITLE %08s "no-title" +@ ORIGIN %16s "5.06.01 Linux 64" +@ DATE %08s "01/03/21" +@ TIME %08s "14.01.24" +* NAME S X PX Y PY +$ %s %le %le %le %le %le + "FASER$START" 0 0 0 0 0 + "DRIFT_0" 4.5 0 0 0 0 + "B1" 5.5 -1.666706349e-06 -6.666984129e-06 0.0001000111112 0.0002000666675 + "DRIFT_1" 10 -3.166813493e-05 -6.666984129e-06 0.001000311115 0.0002000666675 + "FASER$END" 10 -3.166813493e-05 -6.666984129e-06 0.001000311115 0.0002000666675 diff --git a/tests/test-ptc-twiss-tilt/twiss.ptc.simple b/tests/test-ptc-twiss-tilt/twiss.ptc.simple new file mode 100644 index 000000000..025f07846 --- /dev/null +++ b/tests/test-ptc-twiss-tilt/twiss.ptc.simple @@ -0,0 +1,95 @@ +@ NAME %09s "PTC_TWISS" +@ TYPE %05s "TWISS" +@ SEQUENCE %05s "FASER" +@ PARTICLE %08s "POSITRON" +@ MASS %le 0.00051099895 +@ CHARGE %le 1 +@ ENERGY %le 1 +@ PC %le 0.9999998694 +@ GAMMA %le 1956.951184 +@ KBUNCH %le 1 +@ BCURRENT %le 4.803203458e-12 +@ SIGE %le 0.001 +@ SIGT %le 1 +@ NPART %le 1 +@ EX %le 1 +@ EY %le 1 +@ ET %le 0.001 +@ DELTAP %le 0 +@ LENGTH %le 10 +@ ALPHA_C %le -1000000 +@ ALPHA_C_P %le -1000000 +@ ALPHA_C_P2 %le -1000000 +@ ALPHA_C_P3 %le -1000000 +@ ETA_C %le -1000000 +@ GAMMA_TR %le -1000000 +@ Q1 %le 0.2338793977 +@ Q2 %le 0.233879398 +@ DQ1 %le -1000000 +@ DQ2 %le -1000000 +@ QS %le -1000000 +@ BETA_X_MIN %le 1 +@ BETA_X_MAX %le 104.4371868 +@ BETA_Y_MIN %le 1 +@ BETA_Y_MAX %le 104.4371908 +@ BETA11MIN %le 1 +@ BETA11MAX %le 104.0887016 +@ BETA12MIN %le 0 +@ BETA12MAX %le 25.84844449 +@ BETA13MIN %le 0 +@ BETA13MAX %le 0 +@ BETA21MIN %le 0 +@ BETA21MAX %le 25.84844642 +@ BETA22MIN %le 1 +@ BETA22MAX %le 104.0887056 +@ BETA23MIN %le 0 +@ BETA23MAX %le 0 +@ BETA31MIN %le 0 +@ BETA31MAX %le 0 +@ BETA32MIN %le 0 +@ BETA32MAX %le 0 +@ BETA33MIN %le 0 +@ BETA33MAX %le 0 +@ DISP1MIN %le 0 +@ DISP1MAX %le 0 +@ DISP2MIN %le 0 +@ DISP2MAX %le 0 +@ DISP3MIN %le 0 +@ DISP3MAX %le 0 +@ DISP4MIN %le 0 +@ DISP4MAX %le 0 +@ ORBIT_X %le 0 +@ ORBIT_PX %le 0 +@ ORBIT_Y %le 0 +@ ORBIT_PY %le 0 +@ ORBIT_PT %le 0 +@ ORBIT_T %le 0 +@ XCORMS %le 2.001250801e-05 +@ PXCORMS %le 5.157105421e-06 +@ YCORMS %le 0.0006342298672 +@ PYCORMS %le 0.0001549706041 +@ TCORMS %le 0 +@ PTCORMS %le 0 +@ XCOMIN %le -3.16207568e-05 +@ XCOMAX %le 0 +@ PXCOMIN %le -6.657794469e-06 +@ PXCOMAX %le 0 +@ YCOMIN %le 0 +@ YCOMAX %le 0.001000308811 +@ PYCOMIN %le 0 +@ PYCOMAX %le 0.0002000661896 +@ TCOMIN %le -0 +@ TCOMAX %le -0 +@ PTCOMIN %le 0 +@ PTCOMAX %le 0 +@ TITLE %08s "no-title" +@ ORIGIN %16s "5.06.01 Linux 64" +@ DATE %08s "01/03/21" +@ TIME %08s "15.56.14" +* NAME S X PX Y PY +$ %s %le %le %le %le %le + "FASER$START" 0 0 0 0 0 + "DRIFT_0" 4.5 0 0 0 0 + "B1" 5.5 -1.66068109e-06 -6.657794469e-06 0.0001000109398 0.0002000661896 + "DRIFT_1" 10 -3.16207568e-05 -6.657794469e-06 0.001000308811 0.0002000661896 + "FASER$END" 10 -3.16207568e-05 -6.657794469e-06 0.001000308811 0.0002000661896 diff --git a/tests/test-ptc-twiss-tilt/twiss.ptc.simple.cfg b/tests/test-ptc-twiss-tilt/twiss.ptc.simple.cfg new file mode 100644 index 000000000..5060124eb --- /dev/null +++ b/tests/test-ptc-twiss-tilt/twiss.ptc.simple.cfg @@ -0,0 +1,5 @@ +85-88 * skip # date, version +* * abs=1e-12 +* 2 rel=4e-10 # last digit on beta11 +* 8 abs=4e-10 # last digit on disp1 +* 0 omit='DRIFT_' diff --git a/tests/test-ptc-twiss-tilt/twiss.ptc.simple.ref b/tests/test-ptc-twiss-tilt/twiss.ptc.simple.ref new file mode 100644 index 000000000..bf183bcc3 --- /dev/null +++ b/tests/test-ptc-twiss-tilt/twiss.ptc.simple.ref @@ -0,0 +1,95 @@ +@ NAME %09s "PTC_TWISS" +@ TYPE %05s "TWISS" +@ SEQUENCE %05s "FASER" +@ PARTICLE %08s "POSITRON" +@ MASS %le 0.00051099895 +@ CHARGE %le 1 +@ ENERGY %le 1 +@ PC %le 0.9999998694 +@ GAMMA %le 1956.951184 +@ KBUNCH %le 1 +@ BCURRENT %le 4.803203458e-12 +@ SIGE %le 0.001 +@ SIGT %le 1 +@ NPART %le 1 +@ EX %le 1 +@ EY %le 1 +@ ET %le 0.001 +@ DELTAP %le 0 +@ LENGTH %le 10 +@ ALPHA_C %le -1000000 +@ ALPHA_C_P %le -1000000 +@ ALPHA_C_P2 %le -1000000 +@ ALPHA_C_P3 %le -1000000 +@ ETA_C %le -1000000 +@ GAMMA_TR %le -1000000 +@ Q1 %le 0.2338793977 +@ Q2 %le 0.233879398 +@ DQ1 %le -1000000 +@ DQ2 %le -1000000 +@ QS %le -1000000 +@ BETA_X_MIN %le 1 +@ BETA_X_MAX %le 104.4371868 +@ BETA_Y_MIN %le 1 +@ BETA_Y_MAX %le 104.4371908 +@ BETA11MIN %le 1 +@ BETA11MAX %le 104.0887016 +@ BETA12MIN %le 0 +@ BETA12MAX %le 25.84844449 +@ BETA13MIN %le 0 +@ BETA13MAX %le 0 +@ BETA21MIN %le 0 +@ BETA21MAX %le 25.84844642 +@ BETA22MIN %le 1 +@ BETA22MAX %le 104.0887056 +@ BETA23MIN %le 0 +@ BETA23MAX %le 0 +@ BETA31MIN %le 0 +@ BETA31MAX %le 0 +@ BETA32MIN %le 0 +@ BETA32MAX %le 0 +@ BETA33MIN %le 0 +@ BETA33MAX %le 0 +@ DISP1MIN %le 0 +@ DISP1MAX %le 0 +@ DISP2MIN %le 0 +@ DISP2MAX %le 0 +@ DISP3MIN %le 0 +@ DISP3MAX %le 0 +@ DISP4MIN %le 0 +@ DISP4MAX %le 0 +@ ORBIT_X %le 0 +@ ORBIT_PX %le 0 +@ ORBIT_Y %le 0 +@ ORBIT_PY %le 0 +@ ORBIT_PT %le 0 +@ ORBIT_T %le 0 +@ XCORMS %le 2.001250801e-05 +@ PXCORMS %le 5.157105421e-06 +@ YCORMS %le 0.0006342298672 +@ PYCORMS %le 0.0001549706041 +@ TCORMS %le 0 +@ PTCORMS %le 0 +@ XCOMIN %le -3.16207568e-05 +@ XCOMAX %le 0 +@ PXCOMIN %le -6.657794469e-06 +@ PXCOMAX %le 0 +@ YCOMIN %le 0 +@ YCOMAX %le 0.001000308811 +@ PYCOMIN %le 0 +@ PYCOMAX %le 0.0002000661896 +@ TCOMIN %le -0 +@ TCOMAX %le -0 +@ PTCOMIN %le 0 +@ PTCOMAX %le 0 +@ TITLE %08s "no-title" +@ ORIGIN %16s "5.06.01 Linux 64" +@ DATE %08s "01/03/21" +@ TIME %08s "14.00.46" +* NAME S X PX Y PY +$ %s %le %le %le %le %le + "FASER$START" 0 0 0 0 0 + "DRIFT_0" 4.5 0 0 0 0 + "B1" 5.5 -1.66068109e-06 -6.657794469e-06 0.0001000109398 0.0002000661896 + "DRIFT_1" 10 -3.16207568e-05 -6.657794469e-06 0.001000308811 0.0002000661896 + "FASER$END" 10 -3.16207568e-05 -6.657794469e-06 0.001000308811 0.0002000661896 From d60bed75bcafe33c936f0e8f562988140a9a7ad3 Mon Sep 17 00:00:00 2001 From: tpersson Date: Mon, 1 Mar 2021 15:57:58 +0100 Subject: [PATCH 5/5] Added by mistake. --- tests/test-ptc-twiss-tilt/twiss.madx.simple | 53 ------------ tests/test-ptc-twiss-tilt/twiss.ptc.simple | 95 --------------------- 2 files changed, 148 deletions(-) delete mode 100644 tests/test-ptc-twiss-tilt/twiss.madx.simple delete mode 100644 tests/test-ptc-twiss-tilt/twiss.ptc.simple diff --git a/tests/test-ptc-twiss-tilt/twiss.madx.simple b/tests/test-ptc-twiss-tilt/twiss.madx.simple deleted file mode 100644 index d5d9ed5d6..000000000 --- a/tests/test-ptc-twiss-tilt/twiss.madx.simple +++ /dev/null @@ -1,53 +0,0 @@ -@ NAME %05s "TWISS" -@ TYPE %05s "TWISS" -@ SEQUENCE %05s "FASER" -@ PARTICLE %08s "POSITRON" -@ MASS %le 0.00051099895 -@ CHARGE %le 1 -@ ENERGY %le 1 -@ PC %le 0.9999998694 -@ GAMMA %le 1956.951184 -@ KBUNCH %le 1 -@ BCURRENT %le 4.803203458e-12 -@ SIGE %le 0.001 -@ SIGT %le 1 -@ NPART %le 1 -@ EX %le 1 -@ EY %le 1 -@ ET %le 0.001 -@ BV_FLAG %le 1 -@ LENGTH %le 10 -@ ALFA %le 0 -@ ORBIT5 %le -0 -@ GAMMATR %le 0 -@ Q1 %le 0.2338790466 -@ Q2 %le 0.2338790466 -@ DQ1 %le 0 -@ DQ2 %le 0 -@ DXMAX %le 6.333921466e-05 -@ DYMAX %le 0.001000933484 -@ XCOMAX %le 3.166813493e-05 -@ YCOMAX %le 0.001000311115 -@ BETXMAX %le 104.4418501 -@ BETYMAX %le 104.4418501 -@ XCORMS %le 2.004255198e-05 -@ YCORMS %le 0.0006342313264 -@ DXRMS %le 4.008696646e-05 -@ DYRMS %le 0.0006346246687 -@ DELTAP %le 0 -@ SYNCH_1 %le 0 -@ SYNCH_2 %le 0 -@ SYNCH_3 %le 0 -@ SYNCH_4 %le 0 -@ SYNCH_5 %le 0 -@ TITLE %08s "no-title" -@ ORIGIN %16s "5.06.01 Linux 64" -@ DATE %08s "01/03/21" -@ TIME %08s "15.56.14" -* NAME S X PX Y PY -$ %s %le %le %le %le %le - "FASER$START" 0 0 0 0 0 - "DRIFT_0" 4.5 0 0 0 0 - "B1" 5.5 -1.666706349e-06 -6.666984129e-06 0.0001000111112 0.0002000666675 - "DRIFT_1" 10 -3.166813493e-05 -6.666984129e-06 0.001000311115 0.0002000666675 - "FASER$END" 10 -3.166813493e-05 -6.666984129e-06 0.001000311115 0.0002000666675 diff --git a/tests/test-ptc-twiss-tilt/twiss.ptc.simple b/tests/test-ptc-twiss-tilt/twiss.ptc.simple deleted file mode 100644 index 025f07846..000000000 --- a/tests/test-ptc-twiss-tilt/twiss.ptc.simple +++ /dev/null @@ -1,95 +0,0 @@ -@ NAME %09s "PTC_TWISS" -@ TYPE %05s "TWISS" -@ SEQUENCE %05s "FASER" -@ PARTICLE %08s "POSITRON" -@ MASS %le 0.00051099895 -@ CHARGE %le 1 -@ ENERGY %le 1 -@ PC %le 0.9999998694 -@ GAMMA %le 1956.951184 -@ KBUNCH %le 1 -@ BCURRENT %le 4.803203458e-12 -@ SIGE %le 0.001 -@ SIGT %le 1 -@ NPART %le 1 -@ EX %le 1 -@ EY %le 1 -@ ET %le 0.001 -@ DELTAP %le 0 -@ LENGTH %le 10 -@ ALPHA_C %le -1000000 -@ ALPHA_C_P %le -1000000 -@ ALPHA_C_P2 %le -1000000 -@ ALPHA_C_P3 %le -1000000 -@ ETA_C %le -1000000 -@ GAMMA_TR %le -1000000 -@ Q1 %le 0.2338793977 -@ Q2 %le 0.233879398 -@ DQ1 %le -1000000 -@ DQ2 %le -1000000 -@ QS %le -1000000 -@ BETA_X_MIN %le 1 -@ BETA_X_MAX %le 104.4371868 -@ BETA_Y_MIN %le 1 -@ BETA_Y_MAX %le 104.4371908 -@ BETA11MIN %le 1 -@ BETA11MAX %le 104.0887016 -@ BETA12MIN %le 0 -@ BETA12MAX %le 25.84844449 -@ BETA13MIN %le 0 -@ BETA13MAX %le 0 -@ BETA21MIN %le 0 -@ BETA21MAX %le 25.84844642 -@ BETA22MIN %le 1 -@ BETA22MAX %le 104.0887056 -@ BETA23MIN %le 0 -@ BETA23MAX %le 0 -@ BETA31MIN %le 0 -@ BETA31MAX %le 0 -@ BETA32MIN %le 0 -@ BETA32MAX %le 0 -@ BETA33MIN %le 0 -@ BETA33MAX %le 0 -@ DISP1MIN %le 0 -@ DISP1MAX %le 0 -@ DISP2MIN %le 0 -@ DISP2MAX %le 0 -@ DISP3MIN %le 0 -@ DISP3MAX %le 0 -@ DISP4MIN %le 0 -@ DISP4MAX %le 0 -@ ORBIT_X %le 0 -@ ORBIT_PX %le 0 -@ ORBIT_Y %le 0 -@ ORBIT_PY %le 0 -@ ORBIT_PT %le 0 -@ ORBIT_T %le 0 -@ XCORMS %le 2.001250801e-05 -@ PXCORMS %le 5.157105421e-06 -@ YCORMS %le 0.0006342298672 -@ PYCORMS %le 0.0001549706041 -@ TCORMS %le 0 -@ PTCORMS %le 0 -@ XCOMIN %le -3.16207568e-05 -@ XCOMAX %le 0 -@ PXCOMIN %le -6.657794469e-06 -@ PXCOMAX %le 0 -@ YCOMIN %le 0 -@ YCOMAX %le 0.001000308811 -@ PYCOMIN %le 0 -@ PYCOMAX %le 0.0002000661896 -@ TCOMIN %le -0 -@ TCOMAX %le -0 -@ PTCOMIN %le 0 -@ PTCOMAX %le 0 -@ TITLE %08s "no-title" -@ ORIGIN %16s "5.06.01 Linux 64" -@ DATE %08s "01/03/21" -@ TIME %08s "15.56.14" -* NAME S X PX Y PY -$ %s %le %le %le %le %le - "FASER$START" 0 0 0 0 0 - "DRIFT_0" 4.5 0 0 0 0 - "B1" 5.5 -1.66068109e-06 -6.657794469e-06 0.0001000109398 0.0002000661896 - "DRIFT_1" 10 -3.16207568e-05 -6.657794469e-06 0.001000308811 0.0002000661896 - "FASER$END" 10 -3.16207568e-05 -6.657794469e-06 0.001000308811 0.0002000661896