From: albertogomcas <devnull@localhost>
Date: Thu, 6 May 2010 09:07:37 +0000 (+0000)
Subject: Fixes bad call to wlc/fjc fit
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e8dd6b8b81f8f6409c64eb87a8e39face7a5d91;p=hooke.git

Fixes bad call to wlc/fjc fit
---

diff --git a/autopeak.py b/autopeak.py
index c6f5ee5..ed4cea8 100644
--- a/autopeak.py
+++ b/autopeak.py
@@ -99,6 +99,7 @@ class autopeakCommands:
         sigma_p_lengths=[]
         forces=[]
         slopes=[]
+        qstds=[]
         
         #pick up plot
         displayed_plot=self._get_displayed_plot(0)
@@ -186,9 +187,9 @@ class autopeakCommands:
             
             if self.config['fit_function']=='wlc':
                 
-                params, yfit, xfit, fit_errors = self.wlc_fit(points, displayed_plot.vectors[1][0], displayed_plot.vectors[1][1], pl_value, T, return_errors=True)
+                params, yfit, xfit, fit_errors, qstd = self.wlc_fit(points, displayed_plot.vectors[1][0], displayed_plot.vectors[1][1], pl_value, T, return_errors=True)
             elif self.config['fit_function']=='fjc':
-                params, yfit, xfit, fit_errors = self.fjc_fit(points, displayed_plot.vectors[1][0], displayed_plot.vectors[1][1], pl_value, T, return_errors=True)
+                params, yfit, xfit, fit_errors, qstd = self.fjc_fit(points, displayed_plot.vectors[1][0], displayed_plot.vectors[1][1], pl_value, T, return_errors=True)
             else:
                 print 'Unknown fit function'
                 print 'Please set fit_function as wlc or fjc'
@@ -211,7 +212,8 @@ class autopeakCommands:
                 sigma_p_lengths.append(0)
                 sigma_c_lengths.append(fit_errors[0]*(1.0e+9))
                 forces.append(abs(y-avg)*(1.0e+12))
-                slopes.append(slope)     
+                slopes.append(slope)
+                qstds.append(qstd)     
                 #Add WLC fit lines to plot
                 fitplot.add_set(xfit,yfit)
                 if len(fitplot.styles)==0:
@@ -229,7 +231,8 @@ class autopeakCommands:
                     sigma_c_lengths.append(fit_errors[0]*(1.0e+9))
                     sigma_p_lengths.append(fit_errors[1]*(1.0e+9))
                     forces.append(abs(y-avg)*(1.0e+12))
-                    slopes.append(slope)     
+                    slopes.append(slope)
+                    qstds.append(qstd)     
                     
                     #Add WLC fit lines to plot
                     fitplot.add_set(xfit,yfit)
@@ -327,4 +330,4 @@ class autopeakCommands:
             
         f.close()
         self.do_note('autopeak')
-        
\ No newline at end of file
+