Skip to content

Commit

Permalink
Some test updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
@tpersson
tpersson committed Apr 28, 2021
1 parent f3f9b05 commit 5c00aea
Show file tree
Hide file tree
Showing 70 changed files with 22,096 additions and 22,096 deletions.
4 changes: 2 additions & 2 deletions doc/latexuguide/match.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ \section{Insertion Matching}
\madbox{
MATCH, \=SEQUENCE= 'name1', 'name2', \ldots , 'name-n',\\
\>BETA0= 'beta01', 'beta02', \ldots , 'beta0n', \\
\>SLOW=logical;
\>SLOW=logical, TAPERING=logical;
}

or
Expand All @@ -133,7 +133,7 @@ \section{Insertion Matching}
\>BETY=real, ALFY=real, MUY=real, \\
\>X=real, PX=real, Y=real, PY=real, \\
\>DX=real, DY=real, DPX=real, DPY=real, \\
\>DELTAP=real, SLOW=logical;
\>DELTAP=real, SLOW=logical, TAPERING=logical;
}

In the second mode, called insertion matching, the matching routine is
Expand Down
2 changes: 1 addition & 1 deletion src/mad_aper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ else if (!strcmp(apertype,"racetrack")) {
// zero horizontal or vertical explosion factors, and zero radius should be allowed.
// 2015-Mar-09 14:43:33 ghislain: change meaning of parameters: ap1 and ap2 are now full rectangle extension,
// 2015-Mar-10 10:18:46 ghislain: change rounded corners from circular to generalized elliptical shape
if ( (*ap1) < 0 || (*ap2) < 0 || (*ap3) <= 0 || (*ap4) < 0 || (*ap1) < (*ap3) || (*ap2) < (*ap4)) {
if ( (*ap1) < 0 || (*ap2) < 0 || (*ap3) <= 0 || (*ap4) <= 0 || (*ap1) < (*ap3) || (*ap2) < (*ap4)) {
if (debug)
printf("+++ aper_build screen, racetrack parameters: %10.5f %10.5f %10.5f %10.5f -- exiting 0\n", *ap1, *ap2, *ap3, *ap4);
return 0;
Expand Down
8 changes: 4 additions & 4 deletions src/twiss.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ SUBROUTINE tmclor(guess,fsec,ftrk, eig_tol, opt_fun0,rt,tt,eflag)
end SUBROUTINE tmclor

SUBROUTINE tmcheckstab(rt,tol, debug)
use math_constfi, only : one
use math_constfi, only : one, zero
!----------------------------------------------------------------------*
! Purpose: *
! Check the stability of the one turn matrix *
Expand Down Expand Up @@ -669,7 +669,7 @@ SUBROUTINE tmcheckstab(rt,tol, debug)
tmp1 = reval(1)**2 + aival(1)**2
tmp2 = reval(2)**2 + aival(2)**2

write (warnstr,'(a)') 'Horizontal plane might be unstable (values should be less than one)' // &
write (warnstr,'(a)') 'Horizontal plane might be unstable' // &
' More information with the debug flag on.'
call fort_warn('TWCLORB: ',warnstr)
if(debug .ne. zero) print *, 'Eigenvalue(1)**2 ', tmp1, " Eigenvalue(2)**2", tmp2
Expand All @@ -679,7 +679,7 @@ SUBROUTINE tmcheckstab(rt,tol, debug)
tmp1 = reval(1)**2 + aival(1)**2
tmp2 = reval(2)**2 + aival(2)**2

write (warnstr,'(a)') 'Vertical plane might be unstable (values should be less than one)' // &
write (warnstr,'(a)') 'Vertical plane might be unstable' // &
' More information with the debug flag on.'
call fort_warn('TWCLORB: ',warnstr)
if(debug .ne. zero) print *, 'Eigenvalue(3)**2 ', tmp1, " Eigenvalue(4)**2", tmp2
Expand All @@ -688,7 +688,7 @@ SUBROUTINE tmcheckstab(rt,tol, debug)
if (stabt) then
tmp1 = reval(5)**2 + aival(5)**2
tmp2 = reval(6)**2 + aival(6)**2
write (warnstr,'(a)') 'Longitudinal plane might be unstable. (values should be less than one)' // &
write (warnstr,'(a)') 'Longitudinal plane might be unstable.' // &
' Try change lag with 0.5. More information with the debug flag on.'
call fort_warn('TWCLORB: ',warnstr)
if(debug .ne. zero) print *, 'Eigenvalue(5)**2 ', tmp1, " Eigenvalue(6)**2", tmp2
Expand Down
2 changes: 1 addition & 1 deletion testing/updateFromList.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#copyfile(src, dst)
mypath_orig = '../tests/'
file1 = open('../myfail.txt', 'r')
file1 = open('../onlyfail.out', 'r')
Lines = file1.readlines()
loc = os.getcwd()
count = 0
Expand Down
6 changes: 3 additions & 3 deletions tests/test-lhc/ap_ir1b1.tfs.ref
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
@ N1MIN %le 11.0545
@ AT_ELEMENT %12s "MQXFA.B3L1:1"
@ TITLE %08s "no-title"
@ ORIGIN %16s "5.05.02 Linux 64"
@ DATE %08s "10/08/20"
@ TIME %08s "21.45.48"
@ ORIGIN %16s "5.06.01 Linux 64"
@ DATE %08s "28/04/21"
@ TIME %08s "19.09.36"
* NAME KEYWORD PARENT S X Y PX PY BETX BETY ALFX ALFY MUX MUY DX DY DPX DPY N1 APERTYPE APER_1 APER_2 APER_3 APER_4 RTOL XTOL YTOL K0L K1L K2L K3L K4L K5L K0SL K1SL K2SL K3SL K4SL K5SL
$ %s %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %s %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le
"S.DS.L1.B1" 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 4.875386741785218e-05 7.978156530959646e-05 -1.976083222032789e-06 -1.340821147904173e-05 7.267356604800351e+01 6.093186187869521e+01 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 1.172075824243292e+00 -5.517436945358494e-01 0.000000000000000e+00 0.000000000000000e+00 9.999990000000000e+05 "RECTELLIPSE" 9.999999000000001e+00 9.999999000000001e+00 9.999999000000001e+00 9.999999000000001e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
Expand Down
6 changes: 3 additions & 3 deletions tests/test-lhc/ap_ir1b1_-0.0002.tfs.ref
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
@ N1MIN %le 11.0648
@ AT_ELEMENT %12s "MQXFA.B3L1:1"
@ TITLE %08s "no-title"
@ ORIGIN %16s "5.05.02 Linux 64"
@ DATE %08s "10/08/20"
@ TIME %08s "21.46.00"
@ ORIGIN %16s "5.06.01 Linux 64"
@ DATE %08s "28/04/21"
@ TIME %08s "19.09.47"
* NAME KEYWORD PARENT S X Y PX PY BETX BETY ALFX ALFY MUX MUY DX DY DPX DPY N1 APERTYPE APER_1 APER_2 APER_3 APER_4 RTOL XTOL YTOL K0L K1L K2L K3L K4L K5L K0SL K1SL K2SL K3SL K4SL K5SL
$ %s %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %s %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le
"S.DS.L1.B1" 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 -1.871770646184029e-04 1.910085838908869e-04 1.165499479436770e-06 -1.204612511094191e-05 7.702958282733179e+01 5.813151541356777e+01 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 1.187157874476673e+00 -5.605311563343568e-01 0.000000000000000e+00 0.000000000000000e+00 9.999990000000000e+05 "RECTELLIPSE" 9.999999000000001e+00 9.999999000000001e+00 9.999999000000001e+00 9.999999000000001e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
Expand Down
6 changes: 3 additions & 3 deletions tests/test-lhc/ap_ir1b1_-0.0006.tfs.ref
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
@ N1MIN %le 10.7158
@ AT_ELEMENT %12s "MQXFA.B3L1:1"
@ TITLE %08s "no-title"
@ ORIGIN %16s "5.05.02 Linux 64"
@ DATE %08s "10/08/20"
@ TIME %08s "21.46.03"
@ ORIGIN %16s "5.06.01 Linux 64"
@ DATE %08s "28/04/21"
@ TIME %08s "19.09.50"
* NAME KEYWORD PARENT S X Y PX PY BETX BETY ALFX ALFY MUX MUY DX DY DPX DPY N1 APERTYPE APER_1 APER_2 APER_3 APER_4 RTOL XTOL YTOL K0L K1L K2L K3L K4L K5L K0SL K1SL K2SL K3SL K4SL K5SL
$ %s %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %s %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le
"S.DS.L1.B1" 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 -6.686879870135916e-04 4.191027275408107e-04 7.536290784374036e-06 -9.259358004203650e-06 8.627128118239112e+01 5.858039337716804e+01 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 1.220029225226893e+00 -5.798384348421618e-01 0.000000000000000e+00 0.000000000000000e+00 9.999990000000000e+05 "RECTELLIPSE" 9.999999000000001e+00 9.999999000000001e+00 9.999999000000001e+00 9.999999000000001e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
Expand Down
6 changes: 3 additions & 3 deletions tests/test-lhc/ap_ir1b1_0.0002.tfs.ref
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
@ N1MIN %le 11.1285
@ AT_ELEMENT %12s "MQXFA.B3L1:1"
@ TITLE %08s "no-title"
@ ORIGIN %16s "5.05.02 Linux 64"
@ DATE %08s "10/08/20"
@ TIME %08s "21.45.54"
@ ORIGIN %16s "5.06.01 Linux 64"
@ DATE %08s "28/04/21"
@ TIME %08s "19.09.42"
* NAME KEYWORD PARENT S X Y PX PY BETX BETY ALFX ALFY MUX MUY DX DY DPX DPY N1 APERTYPE APER_1 APER_2 APER_3 APER_4 RTOL XTOL YTOL K0L K1L K2L K3L K4L K5L K0SL K1SL K2SL K3SL K4SL K5SL
$ %s %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %s %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le
"S.DS.L1.B1" 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 2.817136723886461e-04 -2.973319619832807e-05 -5.084216557186461e-06 -1.475220759312309e-05 6.848738798444455e+01 6.577692164953588e+01 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 1.157917518485428e+00 -5.436437122785331e-01 0.000000000000000e+00 0.000000000000000e+00 9.999990000000000e+05 "RECTELLIPSE" 9.999999000000001e+00 9.999999000000001e+00 9.999999000000001e+00 9.999999000000001e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
Expand Down
6 changes: 3 additions & 3 deletions tests/test-lhc/ap_ir1b1_0.0006.tfs.ref
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
@ N1MIN %le 10.9106
@ AT_ELEMENT %12s "MQXFA.B3L1:1"
@ TITLE %08s "no-title"
@ ORIGIN %16s "5.05.02 Linux 64"
@ DATE %08s "10/08/20"
@ TIME %08s "21.45.51"
@ ORIGIN %16s "5.06.01 Linux 64"
@ DATE %08s "28/04/21"
@ TIME %08s "19.09.39"
* NAME KEYWORD PARENT S X Y PX PY BETX BETY ALFX ALFY MUX MUY DX DY DPX DPY N1 APERTYPE APER_1 APER_2 APER_3 APER_4 RTOL XTOL YTOL K0L K1L K2L K3L K4L K5L K0SL K1SL K2SL K3SL K4SL K5SL
$ %s %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %s %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le %le
"S.DS.L1.B1" 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 7.394654990478537e-04 -2.442298245466069e-04 -1.119014437310999e-05 -1.739562606180931e-05 6.060440962350322e+01 8.162566220113790e+01 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 1.132379366541924e+00 -5.298515317915984e-01 0.000000000000000e+00 0.000000000000000e+00 9.999990000000000e+05 "RECTELLIPSE" 9.999999000000001e+00 9.999999000000001e+00 9.999999000000001e+00 9.999999000000001e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
Expand Down
Loading

0 comments on commit 5c00aea

Please sign in to comment.