helixish: better debug: introduce dbg_fmt_params (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/helixish.py b/helixish.py
index a4519a2614ff3baceea2434f46d4effb8317638d..60b837d9c640063bef1e58926e018ab8c14e3cbc 100644 (file)
--- a/helixish.py
+++ b/helixish.py
@@ -176,14 +176,16 @@ class HelixishCurve():
                                  findcurve_start,
                                  [findcurve_epsilon]))
 
+    def dbg_fmt_params(fcp):
+      return ('s=%5.2f t=%5.2f la=%5.2f mu=%5.2f ga=%5.2f ka=%5.2f'
+              %
+              (( fcp[0]**2, fcp[1]**2 ) + tuple(fcp[2:])))
+
     dbg(('RUNNING FINDCURVE                           ' +
          ' target Q=[%5.2f %5.2f %5.2f] dQ=[%5.2f %5.2f %5.2f]')
         %
         tuple(findcurve_input[0:6]))
-    dbg(('s=%5.2f t=%5.2f la=%5.2f mu=%5.2f ga=%5.2f ka=%5.2f  initial')
-        %
-        (( findcurve_input[6]**2, findcurve_input[7]**2 ) +
-         tuple(findcurve_input[8:12])))
+    dbg(('%s  initial') % dbg_fmt_params(findcurve_input[6:12]))
 
     print(*findcurve_input, file=findcurve_subproc.stdin)
     findcurve_subproc.stdin.flush()
@@ -198,10 +200,9 @@ class HelixishCurve():
       l = eval(l)
       if l is None: break
 
-      dbg(('s=%5.2f t=%5.2f la=%5.2f mu=%5.2f ga=%5.2f ka=%5.2f' +
-           ' Q=[%5.2f %5.2f %5.2f] dQ=[%5.2f %5.2f %5.2f]')
+      dbg(('%s Q=[%5.2f %5.2f %5.2f] dQ=[%5.2f %5.2f %5.2f]')
           %
-          (( l[0]**2, l[1]**2 ) + tuple(l[2:12])))
+          (( dbg_fmt_params(l[0:6]), ) + tuple(l[6:12]) ))
 
       hc.findcurve_result = l[0:6]
       hc.threshold = l[0]**2