Merge pull request #278 from jgray-19/Multipole_Fixes

Element Map Fixes: Multipole

Author: ldeniau

src/madl_dynmap.mad

@@ -504,7 +504,7 @@ function M.strex_kickh (elm, m, lw) -- [KICKT]                               --
 
   m.atdebug(elm, m, lw, 'strex_kickh:0')
 
-  local el, eh, tdir, nmul, knl, ksl, beam in m
+  local el, tdir, nmul, knl, ksl, beam in m
   local  wchg = lw*tdir*beam.charge
   local _beta = 1/beam.beta
 
@@ -519,10 +519,10 @@ function M.strex_kickh (elm, m, lw) -- [KICKT]                               --
     m[i].py = py + wchg*(bx - ksl[1]*pz)
     m[i].t  = t  - wchg*(knl[1]*x - ksl[1]*y)*(_beta+pt)/pz
 
-    -- curvature
-    if eh ~= 0 then
-      m[i].px = m[i].px - (knl[1]^2/eh)*x   -- eh was el
-      m[i].py = m[i].py - (ksl[1]^2/eh)*y   -- eh was el
+    -- field curvature
+    if el ~= 0 then
+      m[i].px = m[i].px - wchg*(knl[1]^2/el)*x 
+      m[i].py = m[i].py - wchg*(ksl[1]^2/el)*y
     end
   end
 

src/madl_etrck.mad

@@ -246,13 +246,13 @@ local function track_multipole (elm, m)
 
   if m.nmul == 0 then return track_marker(elm, m) end
 
-  local angle, ksi, lrad in elm
+  local angle, ksi, lrad, knl, ksl in elm
   local edir in m
 
-  m.el, m.eh = 0, lrad ~= 0 and angle/lrad*edir or 0
+  m.el = lrad
 
   local kick = strex_kick
-  if abs(angle) >= minang then
+  if abs(knl[1]) + abs(ksl[1]) >= minang then
     kick = strex_kickh
   elseif abs(ksi) >= minstr then
     m.ksi = ksi