summaryrefslogtreecommitdiff
path: root/pyspike/cython
diff options
context:
space:
mode:
authorMario Mulansky <mario.mulansky@gmx.net>2015-04-24 14:58:39 +0200
committerMario Mulansky <mario.mulansky@gmx.net>2015-04-24 14:58:39 +0200
commit3bf9e12e6b5667fb1ea72c969848dacaff3cb470 (patch)
treedb48850684e768b14af9d149639a7fc98bd456a2 /pyspike/cython
parent7da6da8533f9f76a99b959c9de37138377119ffc (diff)
further adjustments in spike sync
Diffstat (limited to 'pyspike/cython')
-rw-r--r--pyspike/cython/cython_distance.pyx6
1 files changed, 3 insertions, 3 deletions
diff --git a/pyspike/cython/cython_distance.pyx b/pyspike/cython/cython_distance.pyx
index 6d998b9..2841da8 100644
--- a/pyspike/cython/cython_distance.pyx
+++ b/pyspike/cython/cython_distance.pyx
@@ -337,10 +337,10 @@ def spike_distance_cython(double[:] t1, double[:] t2,
# coincidence_python
############################################################
cdef inline double get_tau(double[:] spikes1, double[:] spikes2,
- int i, int j, max_tau):
+ int i, int j, double max_tau):
cdef double m = 1E100 # some huge number
- cdef int N1 = len(spikes1)-1
- cdef int N2 = len(spikes2)-1
+ cdef int N1 = spikes1.shape[0]-1 # len(spikes1)-1
+ cdef int N2 = spikes2.shape[0]-1 # len(spikes2)-1
if i < N1 and i > -1:
m = fmin(m, spikes1[i+1]-spikes1[i])
if j < N2 and j > -1: