save calibration loops always, no exceptions

diff --git a/python-lib/calibrate.py b/python-lib/calibrate.py
index d1c0c5b85dc6d46c02bbf088a682a5a5edd26359..7dd6631c411e2bb9dc27b12db508bfbddb755287 100644 (file)
--- a/python-lib/calibrate.py
+++ b/python-lib/calibrate.py
@@ -134,14 +134,18 @@ def secant_opt(func, x0, limits, x1scale=0.1, maxiter=100, k=1.0):
         if not (sum(converging[0:N_CHANNELS]) > 0.0): 
             return (p0, {'nevals': evaluations,
                          'guesses': guesses,
-                         'results': results})
+                         'results': results,
+                         'converged': True})
 
         p0 = p1
         q0 = q1
         p1 = p
         q1 = q
-
-    raise Error("Failed to converge.")
+    return (p0, {'nevals': evaluations,
+                 'guesses': guesses,
+                 'results': results,
+                 'converged': False})
+    #raise Error("Failed to converge.")
 
 
 
@@ -271,7 +275,7 @@ adc.triggerMode(adc.MODE_MANUAL_MANUAL)
 
 
 
-N_CHANNELS = 2
+N_CHANNELS = 48
 N_SAMPLES = 10
 DELAY = 0.05