Changeset 469 for trunk

Timestamp:

09/21/10 10:00:33 (20 months ago)

Author:

pierre

Message:

harmonization between the plots of cv_isi_hist and isi_hist and the normed flag of the histogram

Files:

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

trunk/src/signals/spikes.py

@@ -1329 +1329 @@
         isis          = numpy.concatenate(self.isi())
         if newnum:
-            values, xaxis = numpy.histogram(isis, bins=bins, normed=True, new=newnum)
+            values, xaxis = numpy.histogram(isis, bins=bins, new=newnum)
             xaxis = xaxis[:-1]
         else:
-            values, xaxis = numpy.histogram(isis, bins=bins, normed=True, new=True)
+            values, xaxis = numpy.histogram(isis, bins=bins, new=True)
         subplot       = get_display(display)
         if not subplot or not HAVE_PYLAB:
@@ -1340 +1340 @@
             ylabel = "Probability"
             set_labels(subplot, xlabel, ylabel)
-            subplot.plot(xaxis, values, **kwargs)
+            subplot.plot(xaxis, values/float(values.sum()), **kwargs)
             subplot.set_yticks([]) # arbitrary units
             pylab.draw()
@@ -1424 +1424 @@
         cvs = self.cv_isi(float_only=True)
         if newnum:
-            values, xaxis = numpy.histogram(cvs, bins=bins, normed=True, new=newnum)
+            values, xaxis = numpy.histogram(cvs, bins=bins, new=newnum)
             xaxis = xaxis[:-1]
         else:
-            values, xaxis = numpy.histogram(cvs, bins=bins, normed=True, new=True)
+            values, xaxis = numpy.histogram(cvs, bins=bins, new=True)
         subplot       = get_display(display)
         if not subplot or not HAVE_PYLAB:
@@ -1435 +1435 @@
             ylabel = "% of Neurons"
             set_labels(subplot, xlabel, ylabel)
-            subplot.plot(xaxis, values, **kwargs)
+            subplot.plot(xaxis, values/float(values.sum()), **kwargs)
             pylab.draw()
 
@@ -1573 +1573 @@
         else:
             if newnum:
-                values, xaxis = numpy.histogram(rates, nbins, normed=True, new=newnum)
+                values, xaxis = numpy.histogram(rates, nbins, new=newnum)
                 xaxis = xaxis[:-1]
             else:
-                values, xaxis = numpy.histogram(rates, nbins, normed=True)
+                values, xaxis = numpy.histogram(rates, nbins)
             xlabel = "Average Firing Rate (Hz)"
             ylabel = "% of Neurons"
             set_labels(subplot, xlabel, ylabel)
-            subplot.plot(xaxis, values, **kwargs)
+            subplot.plot(xaxis, values/float(values.sum()), **kwargs)
             pylab.draw()
             
@@ -1976 +1976 @@
         See J. D. Victor and K. P. Purpura,
             Nature and precision of temporal coding in visual cortex: a metric-space
-                analysis.,
+            analysis.,
             J Neurophysiol,76(2):1310-1326, 1996
         
@@ -2158 +2158 @@
         t_start  = numpy.floor(self.t_start/time_bin)
         t_stop   = numpy.floor(self.t_stop/time_bin)
+
         for ev in events:
            ev = numpy.floor(ev/time_bin)