projects
/
hooke.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9e871c0
)
Move 'blind window' and 'min peaks' from FlatPeaksCommand to FlatFiltPlugin
author
W. Trevor King
<wking@drexel.edu>
Wed, 19 May 2010 08:55:53 +0000
(
04:55
-0400)
committer
W. Trevor King
<wking@drexel.edu>
Wed, 19 May 2010 08:55:53 +0000
(
04:55
-0400)
hooke/plugin/flatfilt.py
patch
|
blob
|
history
diff --git
a/hooke/plugin/flatfilt.py
b/hooke/plugin/flatfilt.py
index db54263bb9741ebe609ac12fbe8a480da05b5d6e..efca147af2e964fbf2137987930c6753cdfc378c 100644
(file)
--- 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).
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.
""".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,
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)
] + config_arguments,
help=self.__doc__, plugin=plugin)