Changeset 489

Timestamp:

07/25/11 16:08:20 (10 months ago)

Author:

pierre

Message:

Add an average option for PSTH, if the user wants to have errorbar or not on the final results

Files:

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

trunk/src/signals/spikes.py

@@ -737 +737 @@
     
     
-    def psth(self, events, time_bin=2, t_min=50, t_max=50, display = False, kwargs={}):
+    def psth(self, events, time_bin=2, t_min=50, t_max=50, display = False, kwargs={}, average=True):
         """
         Return the psth of the spike times contained in the SpikeTrain according to selected events, 
@@ -774 +774 @@
         t_start  = numpy.floor(self.t_start/time_bin)
         t_stop   = numpy.floor(self.t_stop/time_bin)
+        result   = []
         for ev in events:
            ev = numpy.floor(ev/time_bin)
            if ((ev - t_min_l )> t_start) and (ev + t_max_l ) < t_stop:
                count  += 1
-               result += spk_hist[(ev-t_min_l):ev+t_max_l]
-        result /= count
+               result += [spk_hist[(ev-t_min_l):ev+t_max_l]]
+        result = numpy.array(result)    
+        if average:        
+            result /= count
         
         if not subplot or not HAVE_PYLAB:
@@ -2395 +2398 @@
                result += spk_hist[:,(ev-t_start-t_min_l):ev-t_start+t_max_l]
         result /= count
-        if average:
-           result = numpy.mean(result, 0)
             
         if not subplot or not HAVE_PYLAB:
@@ -2407 +2408 @@
             if average:
                 subplot.plot(time, result, **kwargs)
+                subplot.errorbar(times, mean(result, 0), yerr=std(result, 0))
             else:
                 for idx in xrange(len(result)):
@@ -2417 +2419 @@
             set_axis_limits(subplot, -t_min, t_max, ymin, ymax)
             pylab.draw()
+        if average:
+            result = numpy.mean(result, 0)
         return result
 
@@ -2501 +2505 @@
                     fname = "_tmp_spikes_%05d.png" %count
                     #logging.debug("Saving Frame %s", fname)
-                    progress_bar(float(t_start)/t_stop)
+                    #progress_bar(float(t_start)/t_stop)
                     pylab.savefig(fname)
                     files.append(fname)