From: devicerandom Date: Mon, 27 Oct 2008 17:48:14 +0000 (+0000) Subject: (autopeak.py) fixed stupid error when pl is fixed X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=54bbbdc5cfe18a1cd133ff7ef928b7f3b0a5e607;p=hooke.git (autopeak.py) fixed stupid error when pl is fixed --- diff --git a/autopeak.py b/autopeak.py index 795189d..7961313 100644 --- a/autopeak.py +++ b/autopeak.py @@ -115,10 +115,7 @@ class autopeakCommands: defplot=flatten(defplot, self.current, customvalue=1) #Flatten curve before feeding it to has_peaks peak_location,peak_size=self.has_peaks(defplot, self.convfilt_config['mindeviation']) return peak_location, peak_size - - - - + #default fit etc. variables pl_value=None T=self.config['temperature'] @@ -234,7 +231,7 @@ class autopeakCommands: #check fitted data and, if right, add peak to the measurement #FIXME: code duplication if len(params)==1: #if we did choose 1-value fit - p_lengths.append(params[1]*(1.0e+9)) + p_lengths.append(pl_value) c_lengths.append(params[0]*(1.0e+9)) forces.append(abs(y-avg)*(1.0e+12)) slopes.append(slope)