diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2015-04-30 14:23:14 +0200 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2015-04-30 14:23:14 +0200 |
| commit | 88c18727290d81ce6f6ff66862cea6da241c7c34 (patch) | |
| tree | 47d1922a621becc87a4573fca9feb4acef821432 /examples/merge.py | |
| parent | 1b9f4ec0aee1281464cfcab02bb4c7c302dbbb00 (diff) | |
| parent | 26d4dd11f80b1c0b4ab19e7cb74c77b61eaad90c (diff) | |
Merge pull request #4 from mariomulansky/develop0.2.0
merge develop
Diffstat (limited to 'examples/merge.py')
| -rw-r--r-- | examples/merge.py | 11 |
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() |