Changeset 466 for trunk

Timestamp:

09/10/10 21:00:40 (21 months ago)

Author:

mpereira

bzr:base-revision:

svn-v4:400bb3d0-8d2e-0410-a2c0-f692ac833539:trunk:465

bzr:committer:

Michael Pereira <michael.fsp@gmail.com>

bzr:file-ids:

src/analysis.py 106@400bb3d0-8d2e-0410-a2c0-f692ac833539:trunk%2Fsrc%2Fanalysis.py

bzr:mapping-version:

v4

bzr:repository-uuid:

400bb3d0-8d2e-0410-a2c0-f692ac833539

bzr:revision-id:

michael.fsp@gmail.com-20100910190108-eqrby15xsyr8br4e

bzr:revno:

410

bzr:revprop:branch-nick:

NeuroTools_branch

bzr:root:

trunk

bzr:timestamp:

2010-09-10 21:01:08.694999933 +0200

bzr:user-agent:

bzr2.2.0+bzr-svn1.0.3

svn:original-date:

2010-09-10T19:01:08.695000Z

Message:

fixed import bug in analysis.crosscorrelate()

Location:

trunk

Files:

• . (modified) (1 prop)
• src/analysis.py (modified) (1 diff)

trunk/src/analysis.py

@@ -23 +23 @@
 """
 
-import os, numpy
+import os
+
+import numpy
+
 from NeuroTools import check_dependency, signals
+
+HAVE_PYLAB = check_dependency('pylab')
+HAVE_MATPLOTLIB = check_dependency('matplotlib')
+if HAVE_PYLAB:
+    import pylab
+else:
+    PYLAB_ERROR = "The pylab package was not detected"
+if not HAVE_MATPLOTLIB:
+    MATPLOTLIB_ERROR = "The matplotlib package was not detected"
+
 
 def arrays_almost_equal(a, b, threshold):