Merge branch 'dev' of github.com:MethodicalAcceleratorDesign/MAD into dev

Author: ldeniau

tests/tests/test-ng-maps/test-multipole-maps.mad

@@ -20,17 +20,18 @@ end
 function TestMult:testQUAD() -- Test the body (~2 min)
   local cfg = ref_cfg "quad" {
     elm = "quadrupole 'quad' {at=0.75, l=1.5, k1=${bdir}*${k1}, k1s=${bdir}*${k1s},tilt=${tdir}*${tilt}, fringe=0}",
-    model  = 1..2,
+    model  = {1, 2},
     method = {2, 4, 6, 8, "'teapot2'", "'teapot4'"},    
     nslice = 1..3,
     energy = {1, 6500},  -- {1, 450, 6500}
 
-    tol = 150,
+    tol = 160,
 
     k1     = {-0.15, 0, 0.2},
     k1s    = {-0.15, 0, 0.2},
+    ptcmodel = {false, true},
     tilt   = 0,
-    alist = tblcat(ref_cfg.alist, {"k1", "k1s"}),
+    alist = tblcat(ref_cfg.alist, {"k1", "k1s", "ptcmodel"}),
 
     plot_info = {
       title    = "Quadrupole NG v NG Maps",

tests/tests/test-ng-maps/test-subelm-maps.mad

@@ -2,6 +2,11 @@ local object, vector             in MAD
 local tblcat                     in MAD.utility
 local run_test                   in require("trackvsng")
 
+--[[
+MISSING TEST ->  SUB ELEMENTS + FRINGE/TILT/MISALIGNMENT
+]]
+
+
 -- Yoshida Integrator Schemes -------------------------------------------------o
 local function make_yoshida (w)
   local d, k, n, s = {}, {}, #w+1, 0

tests/tests/test-ng-maps/trackvsng.mad

@@ -85,16 +85,23 @@ local function debug_chk(cfg, dif, script2)
   if not cfg.dodbg then return end 
   if not chk_tol(dif, cfg.tol, cfg.order) then
     print("Max dif greater than tolerance, stopping...")
-    io.open(out_dir("setup1.mad"), "w"):write(cfg.ref_script):close()
-    io.open(out_dir("setup2.mad"), "w"):write(script2):close()
+    local setup1 = cfg.ref_script:gsub("debug    = 0,", "debug    = 4,")
+    local setup2 =        script2:gsub("debug    = 0,", "debug    = 4,")
+    io.open(out_dir("setup1.mad"), "w"):write(setup1):close()
+    io.open(out_dir("setup2.mad"), "w"):write(setup2):close()
+    os.execute("../mad "..out_dir("setup1.mad").." > setup1.out")
+    os.execute("../mad "..out_dir("setup2.mad").." > setup2.out")
     cfg.stop = true
     return
   end
 end
 
 local function do_unit_test(cfg, dif)
   if cfg.do_utest then
-    assertTrue(chk_tol(dif, cfg.tol, cfg.order), tostring(dif))
+    assertTrue(
+      chk_tol(dif, cfg.tol, cfg.order), 
+      tostring(dif) .. "test type: " .. cfg.cur_cfg.test_type
+    )
   end
 end
 
@@ -151,7 +158,7 @@ local function reverse_edir(cfg, results)
 end
 
 local function cmaps(cfg, results)
-  cfg.cmap = true
+  cfg.cmap = not cfg.cmap
   local cmap_script = create_run(cfg, cfg.cur_cfg)
   local _, cmap_res = loadstring(cmap_script)()
   if cfg.docmap then

tests/tests/tools/test-tool.mad

@@ -173,12 +173,14 @@ local function chk_test(mod_name, test_name) -- Check if the test should be run
 
   -- Check if the test name matches any of the patterns (ignoring 'test')
   for _, p in ipairs(patterns) do 
-    if not string.find(test_name:sub(5), p) then chk = false end
+    if not (string.find(test_name, p) or string.find(mod_name, p)) 
+    then chk = false end
   end
 
   -- Now check if the test name matches any of the excludes (ignoring 'test')
   for _, x in ipairs(excludes) do -- Exclude has priority
-    if string.find(test_name:sub(5), x) then chk = false end
+    if string.find(test_name, x) or string.find(mod_name, x)
+    then chk = false end
   end
   return chk
 end