Changeset 492

Timestamp:

08/23/11 20:01:06 (9 months ago)

Author:

emuller

Message:

threshold_detection now returns empty numpy array instead of list for no spikes (return type should be consistent irrespective of # of spikes returned). Fixes to slice_exclude_events, cov

Files:

• trunk/src/signals/analogs.py (modified) (3 diffs)

trunk/src/signals/analogs.py

@@ -258 +258 @@
             
         if len(cutout) <= 0:
-            events = []
+            events = numpy.zeros(0)
         else:
             take = numpy.where(numpy.diff(cutout)>1)[0]+1
@@ -411 +411 @@
             assert numpy.iterable(events), "events should be a SpikeTrain object or an iterable object"
         assert (t_min >= 0) and (t_max >= 0), "t_min and t_max should be greater than 0"
-        assert len(events) > 0, "events should not be empty and should contained at least one element"
+
+        # if no events to remove, return self
+        if len(events)==0:
+            yield self
+            return
         
         t_last = self.t_start
         for spike in events:
+            # skip spikes which aren't close to the signal interval
+            if spike+t_min<self.t_start or spike-t_min>self.t_stop:
+                continue
+            
             t_min_local = numpy.max([t_last, spike-t_min])
             t_max_local = numpy.min([self.t_stop, spike+t_max])
-            if t_min_local>t_last:
+
+            if t_last<t_min_local:
                 yield self.time_slice(t_last, t_min_local)
+
             t_last = t_max_local
 
@@ -455 +465 @@
 
         assert signal.dt == self.dt
-        assert signal.duration()==self.duration()
+        assert signal.signal.shape==self.signal.shape
 
         return mean(self.signal*signal.signal)-mean(self.signal)*(mean(signal.signal))