Changeset 446 for trunk/src/signals/spikes.py

Timestamp:

04/12/10 15:37:12 (2 years ago)

Author:

apdavison

Message:

SpikeTrain.time_slice() now (again) accepts a sequence of t_start values and a sequence of t_stop values, if you wish to extract multiple slices.

Files:

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

trunk/src/signals/spikes.py

@@ -186 +186 @@
     
     
-    def merge(self, spiketrain):
+    def merge(self, spiketrain, relative=False):
         """
         Add the spike times from a spiketrain to the current SpikeTrain
@@ -192 +192 @@
         Inputs:
             spiketrain - The SpikeTrain that should be added
+            relative - if True, relative_times() is called on both spiketrains before merging
         
         Examples:
@@ -204 +205 @@
                 500
         """
+        if relative:
+            self.relative_times()
+            spiketrain.relative_times()
         self.spike_times = numpy.insert(self.spike_times, self.spike_times.searchsorted(spiketrain.spike_times), \
                                         spiketrain.spike_times)
@@ -464 +468 @@
     def time_slice(self, t_start, t_stop):
         """ 
-        Return a new SpikeTrain obtained by slicing between t_start and t_stop. The new 
-        t_start and t_stop values of the returned SpikeTrain are the one given as arguments
+        Return a new SpikeTrain obtained by slicing between t_start and t_stop,
+        where t_start and t_stop may either be single values or sequences of
+        start and stop times.
         
         Inputs:
@@ -477 +482 @@
             >> spk.t_stop
                 100
-        """
-        spikes = numpy.extract((self.spike_times >= t_start) & (self.spike_times <= t_stop), self.spike_times)
+            >>> spk = spktrain.time_slice([20,70], [40,90])
+            >>> spk.t_start
+                20
+            >>> spk.t_stop
+                90
+            >>> len(spk.time_slice(41, 69))
+                0
+        """
+        if hasattr(t_start, '__len__'):
+            if len(t_start) != len(t_stop):
+                raise ValueError("t_start has %d values and t_stop %d. They must be of the same length." % (len(t_start), len(t_stop)))
+            mask = False
+            for t0,t1 in zip(t_start, t_stop):
+                mask = mask | ((self.spike_times >= t0) & (self.spike_times <= t1))
+            t_start = t_start[0]
+            t_stop = t_stop[-1]
+        else:
+            mask = (self.spike_times >= t_start) & (self.spike_times <= t_stop)
+        spikes = numpy.extract(mask, self.spike_times)
         return SpikeTrain(spikes, t_start, t_stop)
 
@@ -536 +558 @@
         
         Note that the SpikeTrain object itself is modified, t_start 
-        is substracted to spike_times, t_start and t_stop
+        is subtracted from spike_times, t_start and t_stop
         """
         if self.t_start != 0: