Changeset 352

Timestamp:

11/17/08 14:30:50 (2 months ago)

Author:

emuller

Message:

Bug fixes to shotnoise_fromspikes

Files:

• trunk/src/stgen.py (modified) (2 diffs)

trunk/src/stgen.py

@@ -857 +857 @@
-      q - the shot jump for each spike
-      tau - the shot decay time constant in milliseconds
+      dt - the resolution of the resulting shotnoise in milliseconds
-      t_start - start time of the resulting AnalogSignal
-                If unspecified, t_start of spike_train is used
-      t_stop  - stop time of the resulting AnalogSignal
-                If unspecified, t_stop of spike_train is used
-      dt - the resolution of the resulting shotnoise in milliseconds
-      array - if True, returns (shotnoise,t) as numpy arrays, otherwise an AnalogSignal.
-      eps - a numerical parameter indicating at what value of 
@@ -916 +916 @@
-    y = numpy.convolve(a,kern)[0:len(t)]
-
+    if array:
+       signal_t = numpy.arange(window_start,t_stop,dt)
+       signal_y = y[-len(t):]
+       return (signal_y,signal_t)
+
+
-    result = AnalogSignal(y,dt,t_start=0.0,t_stop=t_stop-t_start)
-    result.time_offset(t_start)