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/merge.py | |
parent | d9e2125dcc76693056ab04264add29227f398f4f (diff) | |
parent | 4691d0e77a024fbc73d1098ee557d65f8f2ddc89 (diff) |
Merge branch 'import_time_series' into develop
Conflicts:
pyspike/__init__.py
resolved
Diffstat (limited to 'examples/merge.py')
-rw-r--r-- | examples/merge.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/merge.py b/examples/merge.py index 2ea96ea..b4437a3 100644 --- a/examples/merge.py +++ b/examples/merge.py @@ -21,9 +21,9 @@ merged_spike_train = spk.merge_spike_trains([spike_trains[0], spike_trains[1]]) print(merged_spike_train.spikes) -plt.plot(spike_trains[0].spikes, np.ones_like(spike_trains[0].spikes), 'o') -plt.plot(spike_trains[1].spikes, np.ones_like(spike_trains[1].spikes), 'x') +plt.plot(spike_trains[0], np.ones_like(spike_trains[0]), 'o') +plt.plot(spike_trains[1], np.ones_like(spike_trains[1]), 'x') plt.plot(merged_spike_train.spikes, - 2*np.ones_like(merged_spike_train.spikes), 'o') + 2*np.ones_like(merged_spike_train), 'o') plt.show() |