diff --git a/tracy/tracy/src/t2elem.cc b/tracy/tracy/src/t2elem.cc index 0a31571745a5710a0758ac908c767c0fc0e2adb9..bb53dbceffec0d378eaf1d2abddfab8be03baef7 100644 --- a/tracy/tracy/src/t2elem.cc +++ b/tracy/tracy/src/t2elem.cc @@ -735,9 +735,9 @@ void thin_kick(int Order, double MB[], double L, double h_bend, double h_ref, Compute edge focusing for a dipole There is no radiation coming from the edge The standard formula used is : - irho - px = px0 + ------ tan(phi) *x0 - 1 + dP + + px = px0 + irho tan(phi) *x0 + irho pz = pz0 - ------ tan(phi - psi) *z0 @@ -771,12 +771,15 @@ void thin_kick(int Order, double MB[], double L, double h_bend, double h_ref, expansion. Now chromaticities in Tracy II and Tracy III are the same. Modification based on Tracy II soleil version. + + April 2011, No energy dependence for H-plane according to SSC-141 note (E. Forest) + Agreement better with MAD8 (LNLS), SOLEIL small effect (.1) ****************************************************************************/ template<typename T> static void EdgeFocus(double irho, double phi, double gap, ss_vect<T> &x) { if (true) { // warning: => diverging Taylor map (see SSC-141) - x[px_] += irho * tan(dtor(phi)) * x[x_] / (1.0 + x[delta_]); + x[px_] += irho * tan(dtor(phi)) * x[x_]; x[py_] -= irho * tan(dtor(phi) - get_psi(irho, phi, gap)) * x[y_] / (1.0 + x[delta_]); } else {