diff --git a/tracy/tracy/src/physlib.cc b/tracy/tracy/src/physlib.cc index 22c2e4c83810d4d2594809fae5c84d2e18a496e6..94187e08893a608325de876d7f5c0b289f62c0ec 100644 --- a/tracy/tracy/src/physlib.cc +++ b/tracy/tracy/src/physlib.cc @@ -6,9 +6,9 @@ L. Nadolski SOLEIL 2002 Link to NAFF, Radia field maps J. Bengtsson NSLS-II, BNL 2004 - */ -/* Current revision $Revision: 1.15 $ +/* Current revision $Revision: 1.16 $ On branch $Name: not supported by cvs2svn $ - Latest change by $Author: zhang $ + Latest change by $Author: nadolski $ */ /**************************/ @@ -2644,7 +2644,7 @@ void GetChromTrac(long Nb, long Nbtour, double emax, double *xix, double *xiy) { int i = 0; double Tab[6][NTURN], fx[nterm], fy[nterm], nux1, nux2, nuy1, nuy2; - double x = 1e-6, xp = 0.0, y = 1e-6, yp = 0.0; + double x = 1e-6, xp = 0.0, y = 1e-6, yp = 0.0; double x0 = 1e-6, xp0 = 0.0, y0 = 1e-6, yp0 = 0.0; //double xixExtra = 0.0, xizExtra= 0.0, xixhalf= 0.0, xizhalf= 0.0; //double nux3 = 0.0, nux4 = 0.0, nuz3 = 0.0, nuz4 = 0.0; @@ -2679,9 +2679,9 @@ void GetChromTrac(long Nb, long Nbtour, double emax, double *xix, double *xiy) { nux1, nuy1); /* Tracking for delta = -emax and computing tunes */ - x = x0; + x = x0; xp = xp0; - y = y0; + y = y0; yp = yp0; Trac_Simple4DCOD(x, xp, y, yp, -emax, 0.0, Nbtour, Tab, &status); @@ -2693,7 +2693,7 @@ void GetChromTrac(long Nb, long Nbtour, double emax, double *xix, double *xiy) { Tab[1][Nbtour - 1], Tab[2][Nbtour - 1], Tab[3][Nbtour - 1], Tab[4][Nbtour - 1], Tab[5][Nbtour - 1]); - nux2 = (fabs(fx[0]) > 1e-8 ? fx[0] : fx[1]); + nux2 = (fabs(fx[0]) > ZERO ? fx[0] : fx[1]); nuy2 = fy[0]; if (trace)