Convert doprnt to a Number

tests/tests/test-convergence/converge.mad

@@ -217,7 +217,7 @@ local function run_test(cfg)
   if not cfg.dorun then
     local cfg_tbl, res_tbl = get_prev_res(cfg.name, out_dir)
     res_tbl.max_order = cfg.order
-    if cfg.doprnt then show_res(res_tbl, cfg_tbl, cfg_tbl:colnames(), cfg.tol) end
+    if cfg.doprnt > 0 then show_res(res_tbl, cfg_tbl, cfg_tbl:colnames(), cfg.tol) end
     if cfg.doplot then plot_res(res_tbl, cfg, plt_dir, cfg.dofit, cfg_tbl) end
     return
   end
@@ -239,7 +239,7 @@ local function run_test(cfg)
     novector  = true, 
   }
 
-  if cfg.doprnt then 
+  if cfg.doprnt > 1 then 
     io.write("Running ", cfg.name, " (tol = ", cfg.tol, ")\n")
     for i = 0, cfg.order do io.write("order ", i, "\t") end
     io.write("\n")
@@ -285,7 +285,7 @@ local function run_test(cfg)
   end
 
   -- Print the results
-  if cfg.doprnt then 
+  if cfg.doprnt > 0 then 
     show_res(results, results, cfg.alist, cfg.tol)
   end 
 

tests/tests/test-convergence/test-convergence.mad

@@ -8,7 +8,7 @@ local ref_cfg = object "ref" {
   -- How to run the tests
   dorun  = true, -- Default: true 
   dosave = false, -- Default: false
-  doprnt = false, -- Default: false
+  doprnt = 0    , -- Default: 0
   dodbg  = false, -- Default: false
   doplot = false, -- Default: false
   dofit  = false, -- Default: false

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

@@ -58,7 +58,7 @@ ref_cfg = MAD.object "ref" { -- The reference configuration for all tests
   dorun  = true, -- Default: true 
   dosave = false, -- Default: false
   doplot = false, -- Default: false
-  doprnt = false, -- Default: false
+  doprnt = 0    , -- Default: 0
   dodbg  = false, -- Default: false
 
   dobck  = true, -- Default: true -> Whether to do backtracking (not fringes)

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

@@ -8,7 +8,7 @@ TestCurved = {}
 function TestCurved:setUp()
   -- Turn off all unnecessary components for unit testing
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

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

@@ -9,7 +9,7 @@ function TestElectric:setUp()
   -- Turn off all unnecessary components for unit testing
 
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

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

@@ -8,7 +8,7 @@ TestFringes = {}
 function TestFringes:setUp()
   -- Turn off all unnecessary components for unit testing
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

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

@@ -8,7 +8,7 @@ TestMis = {} --backtrack has high error (1e-12) for straight elements
 function TestMis:setUp()
   -- Turn off all unnecessary components for unit testing
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

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

@@ -8,7 +8,7 @@ TestMisc = {}
 function TestMisc:setUp()
   -- Turn off all unnecessary components for unit testing
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

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

@@ -8,7 +8,7 @@ TestMult = {}
 function TestMult:setUp()
   -- Turn off all unnecessary components for unit testing
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

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

@@ -8,7 +8,7 @@ TestPatch = {}
 function TestPatch:setUp()
   -- Turn off all unnecessary components for unit testing
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

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

@@ -38,7 +38,7 @@ function TestSubElm:setUp()
   -- Turn off all unnecessary components for unit testing
 
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

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

@@ -268,8 +268,8 @@ local function run_test(cfg, equiv)
     novector  = true, 
   }
 
-  if cfg.doprnt then 
-    io.write("Running ", cfg.name, " (tol = ", tostring(cfg.tol), ")\n")
+  io.write("Running ", cfg.name, " (tol = ", tostring(cfg.tol), ")\n")
+  if cfg.doprnt > 1 then 
   -- Print the header
     io.write("cfgid\t")
     for i = 0, cfg.order do io.write("order "..i.."\t") end
@@ -300,7 +300,7 @@ local function run_test(cfg, equiv)
   if cfg.dosave then save_res(cfg, results, nil, {"cfgid", "test_type"}) end
 
   -- Print the results
-  if cfg.doprnt then show_res(results, results, cfg.alist, cfg.tol) end 
+  if cfg.doprnt > 0 then show_res(results, results, cfg.alist, cfg.tol) end 
 
   -- Plot the results
   if cfg.doplot then 

tests/tests/test-ptc-maps/test-electric-maps.mad

@@ -13,7 +13,7 @@ local ref_cfg = object "ref" {
   -- How to run the tests
   dorun  = true, -- Default: true 
   dosave = false, -- Default: false
-  doprnt = false, -- Default: false
+  doprnt = 0    , -- Default: 0
   dodbg  = false, -- Default: false
   doplot = false, -- Default: false
 
@@ -40,7 +40,7 @@ function TestElectric:setUp()
   -- Turn off all unnecessary components for unit testing
   ref_cfg.gen_utest = false
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

tests/tests/test-ptc-maps/test-misalignment-maps.mad

@@ -6,7 +6,7 @@ local ref_cfg = object "ref" {
   -- How to run the tests
   dorun  = true, -- Default: true 
   dosave = false, -- Default: false
-  doprnt = false, -- Default: false
+  doprnt = 0    , -- Default: 0
   dodbg  = false, -- Default: false
   doplot = false, -- Default: false
 
@@ -34,7 +34,7 @@ TestMis = {}
 function TestMis:setUp()
   -- Turn off all unnecessary components for unit testing
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

tests/tests/test-ptc-maps/test-misc-maps.mad

@@ -11,7 +11,7 @@ local ref_cfg = object "ref" {
   -- How to run the tests
   dorun  = true, -- Default: true 
   dosave = false, -- Default: false
-  doprnt = false, -- Default: false
+  doprnt = 0    , -- Default: 0
   dodbg  = false, -- Default: false
   doplot = false, -- Default: false
 
@@ -38,7 +38,7 @@ function TestMisc:setUp()
   -- Turn off all unnecessary components for unit testing
   ref_cfg.gen_utest = false
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

tests/tests/test-ptc-maps/test-mult-maps.mad

@@ -11,7 +11,7 @@ local ref_cfg = object "ref" {
   -- How to run the tests
   dorun  = true, -- Default: true 
   dosave = false, -- Default: false
-  doprnt = false, -- Default: false
+  doprnt = 0    , -- Default: 0
   dodbg  = false, -- Default: false
   doplot = false, -- Default: false
 
@@ -38,7 +38,7 @@ function TestMult:setUp()
   -- Turn off all unnecessary components for unit testing
   ref_cfg.gen_utest = false
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

tests/tests/test-ptc-maps/test-octupole-maps.mad

@@ -11,7 +11,7 @@ local ref_cfg = object "ref" {
   -- How to run the tests
   dorun  = true, -- Default: true 
   dosave = false, -- Default: false
-  doprnt = false, -- Default: false
+  doprnt = 0    , -- Default: 0
   dodbg  = false, -- Default: false
   doplot = false, -- Default: false
 
@@ -38,7 +38,7 @@ function TestOctupole:setUp()
   -- Turn off all unnecessary components for unit testing
   ref_cfg.gen_utest = false
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

tests/tests/test-ptc-maps/test-patch-maps.mad

@@ -11,7 +11,7 @@ local ref_cfg = object "ref" {
   -- How to run the tests
   dorun  = true, -- Default: true 
   dosave = false, -- Default: false
-  doprnt = false, -- Default: false
+  doprnt = 0    , -- Default: 0
   dodbg  = false, -- Default: false
   doplot = false, -- Default: false
 
@@ -38,7 +38,7 @@ function TestPatch:setUp()
   -- Turn off all unnecessary components for unit testing
   ref_cfg.gen_utest = false
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

tests/tests/test-ptc-maps/test-quad-maps.mad

@@ -11,7 +11,7 @@ local ref_cfg = object "ref" {
   -- How to run the tests
   dorun  = true, -- Default: true 
   dosave = false, -- Default: false
-  doprnt = false, -- Default: false
+  doprnt = 0    , -- Default: 0
   dodbg  = false, -- Default: false
   doplot = false, -- Default: false
 
@@ -38,7 +38,7 @@ function TestQuad:setUp()
   -- Turn off all unnecessary components for unit testing
   ref_cfg.gen_utest = false
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

tests/tests/test-ptc-maps/test-rbend-maps.mad

@@ -11,7 +11,7 @@ local ref_cfg = object "ref" {
   -- How to run the tests
   dorun  = true, -- Default: true 
   dosave = false, -- Default: false
-  doprnt = false, -- Default: false
+  doprnt = 0    , -- Default: 0
   dodbg  = false, -- Default: false
   doplot = false, -- Default: false
 
@@ -38,7 +38,7 @@ function TestRBend:setUp()
   -- Turn off all unnecessary components for unit testing
   ref_cfg.gen_utest = false
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

tests/tests/test-ptc-maps/test-sbend-maps.mad

@@ -11,7 +11,7 @@ local ref_cfg = object "ref" {
   -- How to run the tests
   dorun  = true, -- Default: true 
   dosave = false, -- Default: false
-  doprnt = false, -- Default: false
+  doprnt = 0    , -- Default: 0
   dodbg  = false, -- Default: false
   doplot = false, -- Default: false
 
@@ -38,7 +38,7 @@ function TestSBend:setUp()
   -- Turn off all unnecessary components for unit testing
   ref_cfg.gen_utest = false
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

tests/tests/test-ptc-maps/test-sextupole-maps.mad

@@ -11,7 +11,7 @@ local ref_cfg = object "ref" {
   -- How to run the tests
   dorun  = true, -- Default: true 
   dosave = false, -- Default: false
-  doprnt = false, -- Default: false
+  doprnt = 0    , -- Default: 0
   dodbg  = false, -- Default: false
   doplot = false, -- Default: false
 
@@ -38,7 +38,7 @@ function TestSextupole:setUp()
   -- Turn off all unnecessary components for unit testing
   ref_cfg.gen_utest = false
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

tests/tests/test-ptc-maps/test-sol-maps.mad

@@ -11,7 +11,7 @@ local ref_cfg = object "ref" {
   -- How to run the tests
   dorun  = true, -- Default: true 
   dosave = false, -- Default: false
-  doprnt = false, -- Default: false
+  doprnt = 0    , -- Default: 0
   dodbg  = false, -- Default: false
   doplot = false, -- Default: false
 
@@ -38,7 +38,7 @@ function TestSol:setUp()
   -- Turn off all unnecessary components for unit testing
   ref_cfg.gen_utest = false
   ref_cfg.dodbg     = false
-  ref_cfg.doprnt    = false
+  ref_cfg.doprnt    = 0
   ref_cfg.dosave    = false
 
   -- Turn on the components for unit testing

tests/tests/test-ptc-maps/trackvsptc.mad

@@ -113,8 +113,8 @@ local function run_test(cfg)
     novector  = true, 
   }
 
-  if cfg.doprnt then 
-    io.write("Running ", cfg.name, " (tol = ", tostring(cfg.tol), ")\n", "cfgid\t")
+  io.write("Running ", cfg.name, " (tol = ", tostring(cfg.tol), ")\n", "cfgid\t")
+  if cfg.doprnt > 1 then 
     for i = 0, cfg.order do io.write("order ", i, "\t") end
     io.write("\n")
   end
@@ -129,7 +129,7 @@ local function run_test(cfg)
   if cfg.dosave then save_res(cfg, results) end
 
   -- Print the results
-  if cfg.doprnt then show_res(results, results, cfg.alist, cfg.tol) end 
+  if cfg.doprnt > 0 then show_res(results, results, cfg.alist, cfg.tol) end 
 
   -- Plot the results
   if cfg.doplot then  plot_trk_res(results, cfg, plt_dir) end

tests/tests/tools/plot-tool.mad

@@ -118,7 +118,7 @@ end
 local function do_norun(cfg) 
   local cfg_tbl, res_tbl = get_prev_res(cfg.name, out_dir)
   res_tbl.max_order = cfg.order
-  if cfg.doprnt then show_res(res_tbl, cfg_tbl, cfg_tbl:colnames(), cfg.tol) end
+  if cfg.doprnt  > 0 then show_res(res_tbl, cfg_tbl, cfg_tbl:colnames(), cfg.tol) end
   if cfg.doplot then plot_trk_res(res_tbl, cfg, plt_dir, cfg_tbl) end
 end