Dev -> Master

examples/ex-squad-cnv/ex-squad-cnv.mad

@@ -4,7 +4,7 @@ local fringe in MAD.element.flags
 local twopi in MAD.constant
 
 local beam = beam {particle="proton"}
-local cmap = true
+local cmap = false
 local frng = true
 local sdir = 1
 local edir = 1

src/madl_beta0.mad

@@ -45,7 +45,7 @@ local beta0 = object 'beta0' {
     x = 0,   px = 0,   y = 0,   py = 0, t = 0, pt = 0,
    dx = 0,  dpx = 0,  dy = 0,  dpy = 0,
   ddx = 0, ddpx = 0, ddy = 0, ddpy = 0,
-   wx = 0, phix = 0,  wy = 0, phiy = 0,
+   wx = 0,  wxp = 0,  wy = 0,  wyp = 0,
 
    mu1 = 0,  mu2 = 0,  mu3 = 0,
   dmu1 = 0, dmu2 = 0, dmu3 = 0,

src/madl_etrck.mad

@@ -32,12 +32,13 @@ Notes about directions and quantities:
 -- locals ---------------------------------------------------------------------o
 
 local type, ffi in _G
-local abs, max  in math -- ensure that abs will not work on GTPSA.
+local max in math
 
 local element, damap, symint, option, warn, _C                  in MAD
 local is_nil, is_number, is_function                            in MAD.typeid
 local fnil, fset, fcut, ftst, bind3rd                           in MAD.gfunc
-local fact, arc2cord, sqrt, sin, cos, atan2, fval, fabs, fchk   in MAD.gmath
+local fact, arc2cord, abs, sqrt, sin, cos, atan2, fval, fabs, fchk
+                                                                in MAD.gmath
 local assertf, errorf                                           in MAD.utility
 local minlen, minang, minstr, clight, mu0, twopi, pi_2          in MAD.constant
 local is_implicit                                               in element.drift
@@ -1292,8 +1293,10 @@ local function track_quadrupole (elm, m)
     m.k1 = knl[2]/l
     thick, kick = quad_thick, quad_kick -- ptcmodel and quad_kick_ or quad_kick
   elseif no_ang then                                -- skew thick
+    local k = fabs(knl[2])+fabs(ksl[2])
     local a = -0.5*atan2(fval(ksl[2]), fval(knl[2]))
-    m.k1, m.ca, m.sa = sqrt(knl[2]^2 + ksl[2]^2)/l, cos(a), sin(a)
+    m.k1 = k > 0 and sqrt(knl[2]^2+ksl[2]^2)/l or (knl[2]+ksl[2])/l
+    m.ca, m.sa = cos(a), sin(a)
     thick, kick = quad_thicks, quad_kicks -- ptcmodel and quad_kicks_ or quad_kicks
   else                                              -- combined thick
     m.eh, m.mang = angle/l, angle

src/madl_gphys.mad

@@ -90,15 +90,15 @@ local gphys = {
 
   -- optical functions names with chromatic functions (index -> name)
   ofhname = {
-    'alfa11', 'beta11', 'gama11', 'mu1', 'dmu1', 'dx', 'dpx', 'Dx', 'Dpx', 'ddx', 'ddpx', 'wx', 'phix',
-    'alfa22', 'beta22', 'gama22', 'mu2', 'dmu2', 'dy', 'dpy', 'Dy', 'Dpy', 'ddy', 'ddpy', 'wy', 'phiy',
+    'alfa11', 'beta11', 'gama11', 'mu1', 'dmu1', 'dx', 'dpx', 'Dx', 'Dpx', 'ddx', 'ddpx', 'wx', 'wxp',
+    'alfa22', 'beta22', 'gama22', 'mu2', 'dmu2', 'dy', 'dpy', 'Dy', 'Dpy', 'ddy', 'ddpy', 'wy', 'wyp',
     'alfa33', 'beta33', 'gama33', 'mu3', 'dmu3',
   },
 
   -- optical functions names with coupling and chromatic functions (index -> name)
   ofchname = {
-    'alfa11', 'beta11', 'gama11', 'alfa12', 'beta12', 'gama12', 'alfa13', 'beta13', 'gama13', 'mu1', 'dmu1', 'dx', 'dpx', 'Dx', 'Dpx', 'ddx', 'ddpx', 'wx', 'phix',
-    'alfa21', 'beta21', 'gama21', 'alfa22', 'beta22', 'gama22', 'alfa23', 'beta23', 'gama23', 'mu2', 'dmu2', 'dy', 'dpy', 'Dy', 'Dpy', 'ddy', 'ddpy', 'wy', 'phiy',
+    'alfa11', 'beta11', 'gama11', 'alfa12', 'beta12', 'gama12', 'alfa13', 'beta13', 'gama13', 'mu1', 'dmu1', 'dx', 'dpx', 'Dx', 'Dpx', 'ddx', 'ddpx', 'wx', 'wxp',
+    'alfa21', 'beta21', 'gama21', 'alfa22', 'beta22', 'gama22', 'alfa23', 'beta23', 'gama23', 'mu2', 'dmu2', 'dy', 'dpy', 'Dy', 'Dpy', 'ddy', 'ddpy', 'wy', 'wyp',
     'alfa31', 'beta31', 'gama31', 'alfa32', 'beta32', 'gama32', 'alfa33', 'beta33', 'gama33', 'mu3', 'dmu3',
     'betx'  , 'bety'  , 'alfx'  , 'alfy'  , 'kpa'   , 'ev1'   , 'ev2'   , 'r11'   , 'r12'   , 'r21', 'r22', -- Edwards-Teng
     'f1010' , 'f1001' , -- linear RDTs
@@ -1927,9 +1927,9 @@ function gphys.chr2bet (bb0, fdp, dpt) -- TODO: move to beta0?
 
     bb0.wx = sqrt(ax^2 + bx^2)
     if bb0.wx > 1e-12 then
-      local phix = atan2(ax, bx)
-      bb0.phix_  = rangle(phix, bb0.phix_ or phix)
-      bb0.phix   = bb0.phix_ / twopi
+      local wxp = atan2(ax, bx)
+      bb0.wxp_  = rangle(wxp, bb0.wxp_ or wxp)
+      bb0.wxp   = bb0.wxp_ / twopi
     end
   end
 
@@ -1943,9 +1943,9 @@ function gphys.chr2bet (bb0, fdp, dpt) -- TODO: move to beta0?
 
     bb0.wy = sqrt(ay^2 + by^2)
     if bb0.wy > 1e-12 then
-      local phiy = atan2(ay, by)
-      bb0.phiy_  = rangle(phiy, bb0.phiy_ or phiy)
-      bb0.phiy   = bb0.phiy_ / twopi
+      local wyp = atan2(ay, by)
+      bb0.wyp_  = rangle(wyp, bb0.wyp_ or wyp)
+      bb0.wyp   = bb0.wyp_ / twopi
     end
   end
 end

src/madl_match.mad

@@ -173,8 +173,7 @@ local expr_weights = { -- default weight = 1
   ddx   =  10,  ddy   =  10,  ddt   =  10,  dd   =  10,
   ddpx  = 100,  ddpy  = 100,  ddpt  = 100,  ddp  = 100,
   --
-  wx    =   1,  wy    =   1,  wz    =   1,  w    =   1,
-  phix  =   1,  phiy  =   1,  phiz  =   1,  phi  =   1,
+  wx    =   1,  wy    =   1,  wxp   =   1,  wyp  =   1,
   --
   betx  =   1,  bety  =   1,  betz  =   1,  beta =   1,
   alfx  =  10,  alfy  =  10,  alfz  =  10,  alfa =   1,