summaryrefslogtreecommitdiff
path: root/pyspike/spike_sync.py
diff options
context:
space:
mode:
authorMario Mulansky <mario.mulansky@gmx.net>2015-05-08 12:29:47 +0200
committerMario Mulansky <mario.mulansky@gmx.net>2015-05-08 12:29:47 +0200
commit619ffd7105203938a26075c79a77d63960da9922 (patch)
tree8809df98f9b5c8863398024a49ad5c88f8a62cd9 /pyspike/spike_sync.py
parentf44d78a5f0b4ab25bb443accdcb9fc1bd8ff57da (diff)
renamed cython_distance module -> cython_profiles
Diffstat (limited to 'pyspike/spike_sync.py')
-rw-r--r--pyspike/spike_sync.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/pyspike/spike_sync.py b/pyspike/spike_sync.py
index 7d429e4..107734d 100644
--- a/pyspike/spike_sync.py
+++ b/pyspike/spike_sync.py
@@ -36,24 +36,23 @@ def spike_sync_profile(spike_train1, spike_train2, max_tau=None):
# cython implementation
try:
- from cython.cython_distance import coincidence_cython \
- as coincidence_impl
+ from cython.cython_profiles import coincidence_profile_cython \
+ as coincidence_profile_impl
except ImportError:
print("Warning: spike_distance_cython not found. Make sure that \
PySpike is installed by running\n 'python setup.py build_ext --inplace'!\n \
Falling back to slow python backend.")
# use python backend
from cython.python_backend import coincidence_python \
- as coincidence_impl
+ as coincidence_profile_impl
if max_tau is None:
max_tau = 0.0
- times, coincidences, multiplicity = coincidence_impl(spike_train1.spikes,
- spike_train2.spikes,
- spike_train1.t_start,
- spike_train1.t_end,
- max_tau)
+ times, coincidences, multiplicity \
+ = coincidence_profile_impl(spike_train1.spikes, spike_train2.spikes,
+ spike_train1.t_start, spike_train1.t_end,
+ max_tau)
return DiscreteFunc(times, coincidences, multiplicity)