diff --git a/script/fit.py b/script/fit.py index f3517ae..711fe46 100644 --- a/script/fit.py +++ b/script/fit.py @@ -14,8 +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: - #p=plot([ydata],["data"],[xdata], title="Fit" )[0] - plot([ydata],["data"],[xdata], title="Fit" ) + plots = plot([ydata],["data"],[xdata], title="Fit" ) + p = None if plots is None else plots[0] fitted_gaussian_function = Gaussian(norm, mean, sigma) scale_x = [float(min(xdata)), float(max(xdata)) ] points = max((len(xdata)+1), 100) @@ -24,14 +24,13 @@ def fit(ydata, xdata = None, draw_plot = True): fit_x = frange(scale_x[0],scale_x[1],resolution, True) for x in fit_x: 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: + if p is None: + plot([ydata,fit_y],["data","fit"],[xdata,fit_x], title="Fit") draw_plot = False else: - p = plots[0] + p.addSeries(LinePlotSeries("fit")) + p.getSeries(1).setData(fit_x, fit_y) if abs(mean - xdata[index_max]) < abs((scale_x[0] + scale_x[1])/2): if draw_plot: