From 943556f697f3ffd45719ed70a93fb1e67b6a31ef Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 19 May 2010 04:55:53 -0400 Subject: [PATCH] Move 'blind window' and 'min peaks' from FlatPeaksCommand to FlatFiltPlugin --- hooke/plugin/flatfilt.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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) -- 2.26.2