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

Timestamp:

09/02/10 15:42:45 (21 months ago)

Author:

pierre

Message:

Add a gamma_generator function into stgen, and simplify all the positions index in SpikeTrains? objects with dimensions

Files:

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

trunk/src/signals/spikes.py

@@ -915 +915 @@
     #def __setslice__(self, i, j):
 
-
-
     def __setitem__(self, id, spktrain):
         assert isinstance(spktrain, SpikeTrain), "A SpikeList object can only contain SpikeTrain objects"
@@ -1072 +1070 @@
         
         Examples:
-            >> spklist.id_list()
+            >> spklist.id_list
                 [0,2,5]
             >> spklist.complete(arange(5))
-            >> spklist.id_list()
+            >> spklist.id_list
                 [0,1,2,3,4]
         """
@@ -1712 +1710 @@
             return id-offset
         if len(self.dimensions) == 2:
-            x = (id-offset) % self.dimensions[1]
-            y = self.dimensions[0] - 1 - numpy.floor((id-offset)/self.dimensions[1]).astype(int)
+            x = (id-offset) % self.dimensions[0]
+            y = ((id-offset)/self.dimensions[0]).astype(int)
             return (x,y)
 
@@ -1735 +1733 @@
         assert len(position) == len(tuple(self.dimensions)), "position does not have the correct shape !"
         if len(self.dimensions) == 1:
-            return position+offset
+            return position + offset
         if len(self.dimensions) == 2:
-            return (self.dimensions[0] - 1 - position[1])*self.dimensions[1] + position[0] + offset
+            return position[1]*self.dimensions[1] + position[0] + offset
 
 
@@ -1786 +1784 @@
             activity_map = numpy.zeros(self.dimensions, float)
             rates        = spklist.mean_rates()
-            id_offset = min(self.id_list())
+            #id_offset    = min(self.id_list())
+            #x,y          = spklist.id2position(spklist.id_list(), id_offset)
+            x,y          = spklist.id2position(spklist.id_list())            
+            #j,i = x, self.dimensions[0] - 1 - y
             for count, id in enumerate(spklist.id_list()):
-                x,y = spklist.id2position(id, id_offset)
-                j,i = x, self.dimensions[0] - 1 -y
-                activity_map[i,j] = rates[count]
+                #activity_map[i[count],j[count]] = rates[count]                            
+                activity_map[x[count],y[count]] = rates[count]
             if not subplot or not HAVE_PYLAB or not HAVE_MATPLOTLIB:
                 return activity_map
@@ -2247 +2247 @@
             time      = time[sort_idx]
             pos       = pos[sort_idx]
+            x,y       = spk.id2position(pos)
             max_idx   = len(time)-1
             logging.info('Making movie %s - this make take a while' % output)
@@ -2254 +2255 @@
                 while (t_start < t_stop):
                     activity_map = numpy.zeros(spk.dimensions)
-                    while ((time[idx] < t_start + time_bin) and (idx < max_idx)):                        
-                        x,y = spk.id2position(pos[idx])
-                        j,i = x, self.dimensions[0] - 1 -y
-                        activity_map[i,j] += 1
+                    while ((time[idx] < t_start + time_bin) and (idx < max_idx)):                                                
+                        #j,i = x, self.dimensions[0] - 1 -y
+                        activity_map[x[idx],y[idx]] += 1
                         idx += 1
                     im.set_array(activity_map)