Merged with trunk

[hooke.git] / hooke / plugin / multidistance.py

diff --git a/hooke/plugin/multidistance.py b/hooke/plugin/multidistance.py
index 9db5f5dc969c2dd657389f2bb00b0ef9f4231d6f..e2370b6859ce453bbf493be68b0af2820c95093d 100644 (file)
--- a/hooke/plugin/multidistance.py
+++ b/hooke/plugin/multidistance.py
@@ -32,27 +32,10 @@ class multidistanceCommands(object):
      deviation = number of times the convolution signal is above the noise absolute deviation.
      '''
 
-     def find_current_peaks(noflatten, a):
-            #Find peaks.
-           if len(a)==0:
-                 a=self.convfilt_config['mindeviation']
-            try:
-                 abs_devs=float(a)
-            except:
-                print "Bad input, using default."
-                 abs_devs=self.convfilt_config['mindeviation']
-
-            defplot=self.current.curve.default_plots()[0]
-            if not noflatten:
-                flatten=self._find_plotmanip('flatten') #Extract flatten plotmanip
-                defplot=flatten(defplot, self.current, customvalue=1) #Flatten curve before feeding it to has_peaks
-            pk_loc,peak_size=self.has_peaks(defplot, abs_devs)
-            return pk_loc, peak_size
-
-
+      
      noflatten=False
-     peaks_location, peak_size=find_current_peaks(noflatten, args)
-
+     peaks_location, peak_size=self.find_current_peaks(noflatten)
+     
      #if no peaks, we have nothing to plot. exit.
      if len(peaks_location)==0:
             return