From b56d75b76b773f9d762a1f965d00b8246325aa10 Mon Sep 17 00:00:00 2001 From: panepucci Date: Wed, 20 Apr 2016 11:04:25 +0200 Subject: [PATCH] Closedown --- script/fit.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/script/fit.py b/script/fit.py index c785ed2..f3517ae 100644 --- a/script/fit.py +++ b/script/fit.py @@ -14,9 +14,8 @@ def fit(ydata, xdata = None, draw_plot = True): gaussians = fit_gaussians(ydata, xdata, [index_max,]) (norm, mean, sigma) = gaussians[0] if draw_plot: - plots = plot([ydata],["data"],[xdata], title="Fit" ) - plots = None - p = None if (plots is None) else plots[0] + #p=plot([ydata],["data"],[xdata], title="Fit" )[0] + plot([ydata],["data"],[xdata], title="Fit" ) fitted_gaussian_function = Gaussian(norm, mean, sigma) scale_x = [float(min(xdata)), float(max(xdata)) ] points = max((len(xdata)+1), 100) @@ -24,14 +23,15 @@ def fit(ydata, xdata = None, draw_plot = True): fit_y = [] fit_x = frange(scale_x[0],scale_x[1],resolution, True) for x in fit_x: - fit_y.append(fitted_gaussian_function.value(x)) - if p is not None: - p.addSeries(LinePlotSeries("fit")) - p.getSeries(1).setData(fit_x, fit_y) - else: - #Server - plot([ydata,fit_y],["data","fit"],[xdata,fit_x], title="Fit" ) + fit_y.append(fitted_gaussian_function.value(x)) + #p.addSeries(LinePlotSeries("fit")) + #p.getSeries(1).setData(fit_x, fit_y) + plots = plot([ydata,fit_y],["data","fit"],[xdata,fit_x], title="Fit") + #Server + if plots is None: draw_plot = False + else: + p = plots[0] if abs(mean - xdata[index_max]) < abs((scale_x[0] + scale_x[1])/2): if draw_plot: