From: W. Trevor King <wking@drexel.edu>
Date: Wed, 19 May 2010 08:55:53 +0000 (-0400)
Subject: Move 'blind window' and 'min peaks' from FlatPeaksCommand to FlatFiltPlugin
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=943556f697f3ffd45719ed70a93fb1e67b6a31ef;p=hooke.git

Move 'blind window' and 'min peaks' from FlatPeaksCommand to FlatFiltPlugin
---

diff --git a/hooke/plugin/flatfilt.py b/hooke/plugin/flatfilt.py
index db54263..efca147 100644
--- a/hooke/plugin/flatfilt.py
+++ b/hooke/plugin/flatfilt.py
@@ -56,6 +56,13 @@ class FlatFiltPlugin (Plugin):
         self._arguments = [ # For Command initialization
             Argument('median filter', type='int', default=7, help="""
 Median window filter size (in points).
+""".strip()),
+            Argument('blind window', type='float', default=20e-9, help="""
+Meters after the contact point where we do not count peaks to avoid
+non-specific surface interaction.
+""".strip()),
+            Argument('min peaks', type='int', default=4, help="""
+Minimum number of peaks for curve acceptance.
 """.strip()),
             ] + copy.deepcopy(find_peaks_arguments)
         # Set flat-filter-specific defaults for the fit_peak_arguments.
@@ -110,13 +117,6 @@ class FlatPeaksCommand (Command):
             name='flat filter peaks',
             arguments=[
                 CurveArgument,
-            Argument('blind window', type='float', default=20e-9, help="""
-Meters after the contact point where we do not count peaks to avoid
-non-specific surface interaction.
-""".strip()),
-            Argument('median window', type='float', default=7, help="""
-Number of points to use in the initial rolling median filter.
-""".strip()),
                 ] + config_arguments,
             help=self.__doc__, plugin=plugin)