Changeset 480

Timestamp:

02/01/11 11:27:01 (16 months ago)

Author:

apdavison

Message:

Fixed bug reported by Duane Nykamp on 13/01/2011 (problem importing analysis in signals.spikes)

Location:

trunk/src

Files:

• analysis.py (modified) (2 diffs)
• signals/spikes.py (modified) (1 diff)

trunk/src/analysis.py

@@ -27 +27 @@
 import numpy
 
-from NeuroTools import check_dependency, signals
+from NeuroTools import check_dependency
 
 HAVE_PYLAB = check_dependency('pylab')
@@ -166 +166 @@
     sua = []
     for x in (sua1, sua2):
-        if isinstance(x, signals.SpikeTrain):
+        #if isinstance(x, SpikeTrain):
+        if hasattr(x, 'spike_times'):
             sua.append(x.spike_times)
         elif x.ndim == 1:

trunk/src/signals/spikes.py

@@ -29 +29 @@
 import logging
 from NeuroTools import check_dependency, check_numpy_version
-try:
-    from NeuroTools import analysis
-except ImportError:
-    pass
+from NeuroTools import analysis
 
 from NeuroTools.io import *