Improve backtracking compatibility

Author: jgray-19

src/madl_dynmap.mad

@@ -909,8 +909,6 @@ function M.quad_kick (elm, m, lw, ii) -- [KICKTKT7]                          --
   if ii <= 0 then drift_adj(elm, m, ii == 0 and l/2 or l) end
 end
 
-M.quad_kick_ysh = \elm, m, lw -> M.quad_kick(elm, m, lw, 0)
-
 -- skew (tilted by k1s)
 
 function M.quad_thicks (elm, m, lw) -- [PUSHTKT7]                            -- checked
@@ -983,8 +981,6 @@ function M.quad_kicks (elm, m, lw, ii) -- [KICKTKT7]                         --
   if ii <= 0 then drift_adj(elm, m, ii == 0 and l/2 or l) end
 end
 
-M.quad_kicks_ysh = \elm, m, lw -> M.quad_kicks(elm, m, lw, 0)
-
 -- curved (eh ~= 0)
 
 function M.quad_thickh_new (elm, m, lw) -- [PUSHTKT7]                        -- unchecked
@@ -1207,8 +1203,6 @@ function M.quad_kickh (elm, m, lw, ii) -- [KICKTKT7]                         --
   if ii <= 0 then drift_adj(elm, m, ii == 0 and l/2 or l) end
 end
 
-M.quad_kickh_ysh = \elm, m, lw -> M.quad_kickh(elm, m, lw, 0)
-
 -- DKD, TKT [INTER_SOL5] ------------------------------------------------------o
 
 function M.solen_thick (elm, m, lw) -- [KICK_SOL]                            -- checked
@@ -1556,7 +1550,7 @@ FRINGE_TEAPOT:
   FACE, FRINGE_DIPOLE, MULTIPOLE_FRINGE, FRINGE2QUAD
 
 FRINGE_DIPOLE[BEND_FRINGE=TRUE]
-FRINGE2QUAD[PERMFRINGE=2.or.3]
+FRINGE2QUAD[PERMFRINGE=2]
 MULTIPOLE_FRINGE[PERMFRINGE=1.or.3]
 
 NEWFACE[EXACT] / FACE[.not.EXACT]
@@ -1649,7 +1643,7 @@ function M.curex_fringe (elm, m, lw_) -- [FRINGE_TEAPOT]                     --
   if sdir*lw == 1 then
 -- print(lw == 1 and 'forward entry' or 'backward exit')
     yrotation (-e, m, 1)
-    bend_face ( h, m   )
+    bend_face ( h, m, 1)
     if m.frng ~= 0 then
       if ftst(m.frng, fringe.bend) then bend_fringe(elm, m, 1) end
       if ftst(m.frng, fringe.mult) then mult_fringe(elm, m, 1) end
@@ -1666,7 +1660,7 @@ function M.curex_fringe (elm, m, lw_) -- [FRINGE_TEAPOT]                     --
       if ftst(m.frng, fringe.mult) then mult_fringe(elm, m, -1) end
       if ftst(m.frng, fringe.bend) then bend_fringe(elm, m, -1) end
     end
-    bend_face ( h, m    )
+    bend_face ( h, m, -1)
     yrotation ( e, m, -1)
   end
 
@@ -1735,40 +1729,42 @@ end
 
 -- fringes helpers ------------------------------------------------------------o
 
-function bend_face (h, m) -- [NEWFACE]                                   -- checked
+function bend_face (h, m, lw) -- [NEWFACE]                                   -- checked
   if h == 0 then return end
   local el, eld, knl in m
   if abs(el) < minlen or abs(knl[1]) < minstr then return end
 
-  m.atdebug(h, m, 'bend_face:0')
+  m.atdebug(h, m, lw, 'bend_face:0')
 
-  local edir, tdir, beam in m
-  local   k0h = 0.5*h * knl[1]/(eld or el)*edir
+  local edir, sdir, tdir, beam in m
+  ! h is weighted by tdir, el is weighted by sdir, so to get tdir back, we need to multiply by sdir
+  local   k0h = 0.5*h * knl[1]/(eld or el) * sdir
   local   chg = beam.charge
   local _beta = 1/beam.beta
 
   for i=1,m.npar do
     local x, px, y, py, t, pt, beam in m[i]
     local _beta = beam and 1/beam.beta or _beta
     local chg   = beam and beam.charge or chg
+    local k0hq  = k0h*chg -- k0hq must be weighted by bdir
 
-    if tdir == 1 then -- to insure reversal symmetry ; horizontal wedge (only dir)
-      px = px + chg*k0h*x^2
+    if sdir == 1 then -- to insure reversal symmetry ; horizontal wedge (only sdir)
+      px = px + k0hq*x^2
     end
 
     local dpp      =  1 + 2*pt*_beta + pt^2
     local _pt2     =  1/(dpp - px^2)
-    local xi       =  2*k0h*tdir*sqrt(dpp)*_pt2
-    local dxi_px   =  2*px*xi           *_pt2
-    local dxi_ddel = -2   *xi*(1+pt)    *_pt2
+    local xi       =  2*k0hq*sqrt(dpp)*_pt2
+    local dxi_px   =  2*px*xi         *_pt2
+    local dxi_ddel = -2   *xi*(1+pt)  *_pt2
 
     x  = x / (1-dxi_px*y^2)
     px = px - xi*y^2
     py = py - 2*xi*x*y
     t  = t  - dxi_ddel*x*y^2
 
-    if tdir == -1 then -- to insure reversal symmetry; horizontal wedge (only dir)
-      px = px - chg*k0h*x^2
+    if sdir == -1 then -- to insure reversal symmetry; horizontal wedge (only sdir)
+      px = px + k0hq*x^2
     end
 
     m[i].x  = x
@@ -1777,7 +1773,7 @@ function bend_face (h, m) -- [NEWFACE]                                   -- chec
     m[i].t  = t
   end
 
-  m.atdebug(h, m, 'bend_face:1')
+  m.atdebug(h, m, lw, 'bend_face:1')
 end
 
 function mad8_wedge (e, m, lw_, wc) -- [FRINGE_TEAPOT:MAD8_WEDGE]            -- checked