Changeset 425

Timestamp:

08/25/09 10:41:42 (3 years ago)

Author:

lestebanez

Message:

spikes.py : failure : 10, errors : 5

Files:

• branches/interval/src/signals/spikes.py (modified) (10 diffs)

branches/interval/src/signals/spikes.py

@@ -876 +876 @@
         return spklist
 
-    def extract_intervals_from_SpikeList_arguments(self, t_start, t_stop, interval) :
+    def extract_intervals_from_SpikeList_arguments(self, t_start, t_stop, interval) : 
         if interval is not None:
             # interval is fully defined by the user
@@ -925 +925 @@
                         else :
                             interval_out = Interval(t_start)
+                if not (t_start == None or t_stop == None) :
+                    interval_out = Interval([[t_start, t_stop]])
         return interval_out
 
@@ -947 +949 @@
         assert isinstance(spktrain, SpikeTrain), "A SpikeList object can only contain SpikeTrain objects"
         self.spiketrains[id] = spktrain
-        self.__calc_startstop()
+        self.spiketrains[id].interval.intersect(self.interval)
 
     def __iter__(self):
@@ -1548 +1550 @@
             mean_rates, mean_rate_std
         """
-        interval = extract_intervals_from_SpikeList_arguments(t_start, t_stop, interval)
+        interval = self.extract_intervals_from_SpikeList_arguments(t_start, t_stop, interval)
 
         return numpy.mean(self.mean_rates(interval))
@@ -1570 +1572 @@
             mean_rate, mean_rates
         """
-        interval = extract_intervals_from_SpikeList_arguments(t_start, t_stop, interval)
+        interval = self.extract_intervals_from_SpikeList_arguments(t_start, t_stop, interval)
         return numpy.std(self.mean_rates(interval))
 
@@ -1586 +1588 @@
             mean_rate, mean_rate_std
         """
-        interval = extract_intervals_from_SpikeList_arguments(t_start, t_stop, interval)
+        interval = self.extract_intervals_from_SpikeList_arguments(t_start, t_stop, interval)
         rates = []
         for id in self.id_list():
@@ -1813 +1815 @@
         subplot = get_display(display)
 
-        interval = extract_intervals_from_SpikeTrain_arguments(t_start, t_stop, interval)        
+        interval = self.extract_intervals_from_SpikeList_arguments(t_start, t_stop, interval)        
         if not interval.is_equal(self.interval):
             spklist = self.interval_slice(interval)
@@ -2132 +2134 @@
             spk = self.id_slice(id_list)
 
-        interval = extract_intervals_from_SpikeTrain_arguments(t_start, t_stop, interval)   
+        interval = self.extract_intervals_from_SpikeList_arguments(t_start, t_stop, interval)   
         if not interval.is_equal(spk.interval):
             spk = spk.interval_slice(interval)
@@ -2259 +2261 @@
         subplot = get_display(display)
 
-        interval = extract_intervals_from_SpikeTrain_arguments(t_start, t_stop, interval)   
+        interval = self.extract_intervals_from_SpikeList_arguments(t_start, t_stop, interval)   
         if not subplot or not HAVE_PYLAB:
             print PYLAB_ERROR
@@ -2476 +2478 @@
     The format of the file (text, pickle) will be inferred automatically
     """
-    interval = extract_intervals_from_SpikeTrain_arguments(t_start, t_stop, interval)   
     spike_loader = DataHandler(user_file)
-    return spike_loader.load_spikes(id_list=id_list, interval=interval, dims=dims)
+    return spike_loader.load_spikes(id_list=id_list, t_start=None, t_stop=None, dims=dims)