Initialize 'min peaks' from configuration (if required) in convfilt/flatfilt

diff --git a/hooke/plugin/convfilt.py b/hooke/plugin/convfilt.py
index b85348a6feae57a679a2e41de7980a45b6f2e290..7ca9861191f9ffc3acd3910fb4aa37cee82d9a23 100644 (file)
--- a/hooke/plugin/convfilt.py
+++ b/hooke/plugin/convfilt.py
@@ -216,4 +216,6 @@ class ConvolutionFilterCommand (FilterCommand):
         ret = outq.get()
         if not isinstance(ret, Success):
             raise ret
+        if params['min peaks'] == None: # Use configured default value.
+            params['min peaks'] = self.plugin.config['min peaks']
         return len(peaks) >= params['min peaks']

diff --git a/hooke/plugin/flatfilt.py b/hooke/plugin/flatfilt.py
index ca9b1b89e8cc5ef761a6476b05877486f6999e0e..6637eb81f7ec37d8e3a81cf0b0e8786d97d6fc40 100644 (file)
--- a/hooke/plugin/flatfilt.py
+++ b/hooke/plugin/flatfilt.py
@@ -208,4 +208,6 @@ class FlatFilterCommand (FilterCommand):
         ret = outq.get()
         if not isinstance(ret, Success):
             raise ret
+        if params['min peaks'] == None: # Use configured default value.
+            params['min peaks'] = self.plugin.config['min peaks']
         return len(peaks) >= int(params['min peaks'])