Changeset 434 for branches

Timestamp:

08/29/09 00:13:01 (3 years ago)

Author:

lestebanez

Message:

Spikes.py : optimize the use of intervals in the PSTH for multiple spike trains

Files:

• branches/interval/src/signals/spikes.py (modified) (1 diff)

branches/interval/src/signals/spikes.py

@@ -2191 +2191 @@
         t_max_l  = numpy.floor(t_max/time_bin)
         result   = numpy.zeros((len(self), t_min_l+t_max_l), numpy.float32)
+        events_interval = copy.copy(self.interval)
+        events_interval.offset_start(t_min, colapse=True)
+        events_interval.offset_stop(-t_max, colapse=True)
+        events = events_interval.slice_times(events)
+        assert len(events) > 0, "the PSTH windows [event-t_min, event+t_max] should be included within the spike train interval"
         for ev in events:
-           itv = Interval((ev-t_min,ev+t_max))
-           ev  = numpy.floor(ev/time_bin)
-           if itv.intersect(self.interval).total_duration() == (t_max+t_min):
-               count  += 1
-               result += spk_hist[:,(ev-t_min_l):ev+t_max_l]
+            ev  = numpy.floor((ev - self.interval.t_start())/float(time_bin))
+            count  += 1.    
+            result += spk_hist[(ev-t_min_l):ev+t_max_l]
         result /= count
         if average: