From 9ba008b075a08fe9acb40362a92254f1f3233f05 Mon Sep 17 00:00:00 2001 From: Dan White Date: Sat, 1 Sep 2012 22:40:07 -0500 Subject: [PATCH] save calibration loops always, no exceptions --- python-lib/calibrate.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/python-lib/calibrate.py b/python-lib/calibrate.py index d1c0c5b..7dd6631 100644 --- 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 -- 2.25.1