diff options
author | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-29 12:35:51 +0200 |
---|---|---|
committer | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-29 12:35:51 +0200 |
commit | ad29154d8c152996d16c012dcc5798c5f1957aed (patch) | |
tree | f01575082a649061362178d4a9870cb5fe2c33f6 /examples/averages.py | |
parent | 1fa8493ce15af8cd4c057eece155f1557fc241ea (diff) | |
parent | c17cc8602414cec883c412008a4300b2c7ac7f80 (diff) |
Merge branch 'master' into new_directionality
Conflicts:
pyspike/__init__.py
pyspike/cython/cython_directionality.pyx
pyspike/cython/directionality_python_backend.py
pyspike/spike_directionality.py
setup.py
Diffstat (limited to 'examples/averages.py')
-rw-r--r-- | examples/averages.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/averages.py b/examples/averages.py index c3e81e2..8b405d0 100644 --- a/examples/averages.py +++ b/examples/averages.py @@ -12,7 +12,7 @@ from __future__ import print_function import pyspike as spk spike_trains = spk.load_spike_trains_from_txt("PySpike_testdata.txt", - time_interval=(0, 4000)) + edges=(0, 4000)) f = spk.isi_profile(spike_trains[0], spike_trains[1]) |