Changeset 472 for trunk

Timestamp:

10/30/10 17:23:55 (19 months ago)

Author:

emuller

Message:

stgen._gen_g_add ... got working again ... an alternative to shotnoise_fromspike which can be faster if the number of spikes is small ...

Files:

• trunk/src/stgen.py (modified) (1 diff)

trunk/src/stgen.py

@@ -1058 +1058 @@
 
 
-def _gen_g_add(spikes,tau,q,t,eps = 1.0e-8):
+def _gen_g_add(spikes,q,tau,t,eps = 1.0e-8):
+    """
+
+    spikes is a SpikeTrain object
+
+    """
 
     #spikes = poisson_generator(rate,t[-1])
 
-    gd_s = zeros(shape(t),Float)
+    gd_s = numpy.zeros(t.shape,float)
 
     dt = t[1]-t[0]
 
     # time of vanishing significance
-    vs_t = -tau*log(eps/q)
-    kern = q*exp(-arrayrange(0.0,vs_t,dt)/tau)
+    vs_t = -tau*numpy.log(eps/q)
+    kern = q*numpy.exp(-numpy.arange(0.0,vs_t,dt)/tau)
 
     vs_idx = len(kern)
 
-    idx = clip(searchsorted(t,spikes),0,len(t)-1)
-    idx2 = clip(idx+vs_idx,0,len(gd_s))
+    idx = numpy.clip(numpy.searchsorted(t,spikes.spike_times),0,len(t)-1)
+    idx2 = numpy.clip(idx+vs_idx,0,len(gd_s))
     idx3 = idx2-idx