summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Glover <glover.john@gmail.com>2011-08-19 16:07:54 +0100
committerJohn Glover <glover.john@gmail.com>2011-08-19 16:07:54 +0100
commitebe7477f7149301d48d639960b6a9bf0979fba1d (patch)
treec8717d1314f6349397b2a08328524fa922b8dcb1
parent21af6f2f454b78159ba49f4d75dceadebe25b9bf (diff)
downloadsimpl-ebe7477f7149301d48d639960b6a9bf0979fba1d.tar.gz
simpl-ebe7477f7149301d48d639960b6a9bf0979fba1d.tar.bz2
simpl-ebe7477f7149301d48d639960b6a9bf0979fba1d.zip
load LorisPeakDetection from the C++ module
-rw-r--r--simpl/loris.py16
1 files changed, 7 insertions, 9 deletions
diff --git a/simpl/loris.py b/simpl/loris.py
index f6e4a81..0e09d11 100644
--- a/simpl/loris.py
+++ b/simpl/loris.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 John Glover, National University of Ireland, Maynooth
+# Copyright (c) 2009-2011 John Glover, National University of Ireland, Maynooth
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,16 +14,14 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-import simpl
-from simpl import simplloris
import numpy as np
+import simpl
+from simpl.simplloris import LorisPeakDetection
-Analyzer = simplloris.Analyzer
-
-class LorisPeakDetection(simpl.PeakDetection):
- "Sinusoidal peak detection using Loris"
- def __init__(self):
- simpl.PeakDetection.__init__(self)
+# class LorisPeakDetection(simpl.PeakDetection):
+# "Sinusoidal peak detection using Loris"
+# def __init__(self):
+# simpl.PeakDetection.__init__(self)
class LorisPartialTracking(simpl.PartialTracking):