summaryrefslogtreecommitdiff
path: root/examples/merge.py
diff options
context:
space:
mode:
authorMario Mulansky <mario.mulansky@gmx.net>2015-04-27 17:35:36 +0200
committerMario Mulansky <mario.mulansky@gmx.net>2015-04-27 17:35:36 +0200
commitecc7898a0b6cd5bc353fd246f3ad549934c82229 (patch)
treea80c65f3a508609ac421d4a847bc9801913dfd55 /examples/merge.py
parentcc8ae1974454307de4c69d9bb2a860538f0adfef (diff)
adjustments of examples
Diffstat (limited to 'examples/merge.py')
-rw-r--r--examples/merge.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/examples/merge.py b/examples/merge.py
index 2550cdb..2ea96ea 100644
--- a/examples/merge.py
+++ b/examples/merge.py
@@ -17,12 +17,13 @@ import pyspike as spk
# first load the data, ending time = 4000
spike_trains = spk.load_spike_trains_from_txt("PySpike_testdata.txt", 4000)
-spikes = spk.merge_spike_trains([spike_trains[0], spike_trains[1]])
+merged_spike_train = spk.merge_spike_trains([spike_trains[0], spike_trains[1]])
-print(spikes)
+print(merged_spike_train.spikes)
-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(spikes, 2*np.ones_like(spikes), 'o')
+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(merged_spike_train.spikes,
+ 2*np.ones_like(merged_spike_train.spikes), 'o')
plt.show()