From 355fdd6cf41e914c4318b9bf90d7c0c8846fcfd7 Mon Sep 17 00:00:00 2001 From: panepucci Date: Wed, 20 Apr 2016 10:59:11 +0200 Subject: [PATCH] Startup --- script/fit.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/script/fit.py b/script/fit.py index 0e86111..575c2d3 100644 --- a/script/fit.py +++ b/script/fit.py @@ -10,22 +10,18 @@ def fit(ydata, xdata = None, draw_plot = True): print "Max index:" + str(index_max), print " x:" + str(max_x), print " y:" + str(max_y) + gaussians = fit_gaussians(ydata, xdata, [index_max,]) (norm, mean, sigma) = gaussians[0] if draw_plot: - print "1" - p = plot([ydata],["data"],[xdata], title="Fit" )[0] - print "2" + plots = plot([ydata],["data"],[xdata], title="Fit" ) + p = None if (plots is None) else plots[0] fitted_gaussian_function = Gaussian(norm, mean, sigma) - print "3" scale_x = [float(min(xdata)), float(max(xdata)) ] - print "4" points = max((len(xdata)+1), 100) - print "5" resolution = (scale_x[1]-scale_x[0]) / points fit_y = [] fit_x = frange(scale_x[0],scale_x[1],resolution, True) - print "6" for x in fit_x: fit_y.append(fitted_gaussian_function.value(x)) if p is not None: @@ -33,9 +29,7 @@ def fit(ydata, xdata = None, draw_plot = True): p.getSeries(1).setData(fit_x, fit_y) else: #Server - print "Server" p = plot([ydata,fit_y],["data","fit"],[xdata,fit_x], title="Fit" )[0] - print "After" draw_plot = False if abs(mean - xdata[index_max]) < abs((scale_x[0] + scale_x[1])/2):