Skip to content

Commit

Permalink
Merge pull request #85 'jsilter/find_peaks'
Browse files Browse the repository at this point in the history
Add several functions for the purpose of finding peaks in a 1-D ndarray.
  • Loading branch information
pv committed Dec 17, 2011
2 parents 03f9e4a + 9d93908 commit ba6560e
Show file tree
Hide file tree
Showing 6 changed files with 824 additions and 59 deletions.
2 changes: 1 addition & 1 deletion THANKS.txt
Expand Up @@ -95,7 +95,7 @@ Fazlul Shahriar for fixes to the NetCDF3 I/O.
Chris Jordan-Squire for bug fixes, documentation improvements and
scipy.special.logit & expit.
Christoph Gohlke for many bug fixes and help with Windows specific issues.

Jacob Silterra for cwt-based peak finding in scipy.signal.

Institutions
------------
Expand Down
14 changes: 14 additions & 0 deletions scipy/signal/__init__.py
Expand Up @@ -187,6 +187,19 @@
daub -- return low-pass
morlet -- Complex Morlet wavelet.
qmf -- return quadrature mirror filter from low-pass
ricker -- return ricker wavelet
cwt -- perform continuous wavelet transform
Peak finding
============
.. autosummary::
:toctree: generated/
find_peaks_cwt -- Attempt to find the peaks in the given 1-D array
argrelmin -- Calculate the relative minima of data
argrelmax -- Calculate the relative maxima of data
argrelextrema -- Calculate the relative extrema of data
"""

Expand All @@ -207,6 +220,7 @@
from signaltools import *
from spectral import *
from wavelets import *
from _peak_finding import *

__all__ = filter(lambda s: not s.startswith('_'), dir())
from numpy.testing import Tester
Expand Down

0 comments on commit ba6560e

Please sign in to comment.