summaryrefslogtreecommitdiff
path: root/examples/test_merge.py
diff options
context:
space:
mode:
Diffstat (limited to 'examples/test_merge.py')
-rw-r--r--examples/test_merge.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/examples/test_merge.py b/examples/test_merge.py
index 1186062..0c34608 100644
--- a/examples/test_merge.py
+++ b/examples/test_merge.py
@@ -6,11 +6,8 @@ import matplotlib.pyplot as plt
import pyspike as spk
-# first load the data
-spike_trains = []
-spike_file = open("SPIKY_testdata.txt", 'r')
-for line in spike_file:
- spike_trains.append(spk.spike_train_from_string(line))
+# first load the data, ending time = 4000
+spike_trains = spk.load_spike_trains_from_txt("SPIKY_testdata.txt", 4000)
spikes = spk.merge_spike_trains([spike_trains[0], spike_trains[1]])