From 69d3011a00e3209219cd6b6408ed850239850699 Mon Sep 17 00:00:00 2001
From: nadolski <nadolski@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d>
Date: Thu, 19 May 2011 15:24:56 +0000
Subject: [PATCH] Remove additional focusing in H-plane in edge focusing
---
tracy/tracy/src/t2elem.cc | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/tracy/tracy/src/t2elem.cc b/tracy/tracy/src/t2elem.cc
index 0a31571..bb53dbc 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 {
--
GitLab