Changeset 478

Timestamp:

01/20/11 14:44:18 (2 years ago)

Author:

mschmucker

Message:

worked around change in signature of numpy.historgam, trying to maintain compatibility to older versions (read: it's an ugly hack ;) )

Files:

• trunk/src/signals/spikes.py (modified) (7 diffs)

trunk/src/signals/spikes.py

@@ -28 +28 @@
 import os, re, numpy
 import logging
-from NeuroTools import check_dependency, check_numpy_version
+from NeuroTools import check_dependency, check_numpy_version, check_numpy_histogram_supports_new
 try:
     from NeuroTools import analysis
@@ -55 +55 @@
 newnum = check_numpy_version()
 
+# check whether numpy.histogram supports the deprecated "new" keyword.
+hist_new = True
+try:
+    numpy.histogram(numpy.array([1,2,3]), new=True)
+except TypeError:
+    hist_new = False
 
 class SpikeTrain(object):
@@ -360 +366 @@
             return numpy.nan
         else:
-            if newnum:
-                proba_isi, xaxis = numpy.histogram(isi, bins=bins, normed=True, new=True)
+            if not hist_new:
+                proba_isi, xaxis = numpy.histogram(isi, bins=bins, normed=True)
                 xaxis = xaxis[:-1]
             else:
-                proba_isi, xaxis = numpy.histogram(isi, bins=bins, normed=True)
+                if newnum:
+                    proba_isi, xaxis = numpy.histogram(isi, bins=bins, normed=True, new=True)
+                    xaxis = xaxis[:-1]
+                else:
+                    proba_isi, xaxis = numpy.histogram(isi, bins=bins, normed=True)
             proba_isi /= numpy.sum(proba_isi)
             bin_size = xaxis[1]-xaxis[0]
@@ -550 +560 @@
         bins = self.time_axis(time_bin)
         if newnum:
-            hist, edges = numpy.histogram(self.spike_times, bins, new=newnum)
+            if not hist_new:
+                hist, edges = numpy.histogram(self.spike_times, bins)
+            else:
+                hist, edges = numpy.histogram(self.spike_times, bins, new=newnum)
         else:
             hist, edges = numpy.histogram(self.spike_times, bins)
@@ -1330 +1343 @@
         isis          = numpy.concatenate(self.isi())
         if newnum:
-            values, xaxis = numpy.histogram(isis, bins=bins, new=newnum)
-            xaxis = xaxis[:-1]
+            if not hist_new:
+                values, xaxis = numpy.histogram(isis, bins=bins)
+                xaxis = xaxis[:-1]
+            else:
+                values, xaxis = numpy.histogram(isis, bins=bins, new=newnum)
+                xaxis = xaxis[:-1]
         else:
             values, xaxis = numpy.histogram(isis, bins=bins, new=True)
@@ -1426 +1443 @@
         cvs = self.cv_isi(float_only=True)
         if newnum:
-            values, xaxis = numpy.histogram(cvs, bins=bins, new=newnum)
-            xaxis = xaxis[:-1]
+            if not hist_new:
+                values, xaxis = numpy.histogram(cvs, bins=bins)
+                xaxis = xaxis[:-1]
+            else:
+                values, xaxis = numpy.histogram(cvs, bins=bins, new=newnum)
+                xaxis = xaxis[:-1]
         else:
             values, xaxis = numpy.histogram(cvs, bins=bins, new=True)
@@ -1576 +1597 @@
         else:
             if newnum:
-                values, xaxis = numpy.histogram(rates, nbins, new=newnum)
-                xaxis = xaxis[:-1]
+                if not hist_new:
+                    values, xaxis = numpy.histogram(rates, nbins)
+                    xaxis = xaxis[:-1]
+                else:
+                    values, xaxis = numpy.histogram(rates, nbins, new=newnum)
+                    xaxis = xaxis[:-1]
             else:
                 values, xaxis = numpy.histogram(rates, nbins)