diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2016-06-18 16:32:39 -0700 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2016-06-18 16:32:39 -0700 |
| commit | a63839708d6574567bcd518a822a9f10629ed80b (patch) | |
| tree | 02c28e0856b62c08fd4d3622ee68d145d8eee6eb /examples/averages.py | |
| parent | d9e2125dcc76693056ab04264add29227f398f4f (diff) | |
| parent | 4691d0e77a024fbc73d1098ee557d65f8f2ddc89 (diff) | |
Merge branch 'import_time_series' into develop
Conflicts:
pyspike/__init__.py
resolved
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]) |