summaryrefslogtreecommitdiff
path: root/pyspike/spikes.py
diff options
context:
space:
mode:
authorMario Mulansky <mario.mulansky@gmx.net>2015-01-19 16:39:17 +0100
committerMario Mulansky <mario.mulansky@gmx.net>2015-01-19 16:39:17 +0100
commitfed0ceec753fc1a7e5a1e20632de5a9800fe4fb1 (patch)
tree2f2799df76e81f2694a862af6e564abb995f8816 /pyspike/spikes.py
parentf3f6eb8eec87c2a13183bfe512ef2747dfb33ed6 (diff)
final version for spike sync
Diffstat (limited to 'pyspike/spikes.py')
-rw-r--r--pyspike/spikes.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pyspike/spikes.py b/pyspike/spikes.py
index aa25c48..6a3353e 100644
--- a/pyspike/spikes.py
+++ b/pyspike/spikes.py
@@ -67,7 +67,7 @@ def spike_train_from_string(s, sep=' ', is_sorted=False):
# load_spike_trains_txt
############################################################
def load_spike_trains_from_txt(file_name, time_interval=None,
- separator=' ', comment='#', sort=True):
+ separator=' ', comment='#', is_sorted=False):
""" Loads a number of spike trains from a text file. Each line of the text
file should contain one spike train as a sequence of spike times separated
by `separator`. Empty lines as well as lines starting with `comment` are
@@ -94,7 +94,7 @@ def load_spike_trains_from_txt(file_name, time_interval=None,
for line in spike_file:
if len(line) > 1 and not line.startswith(comment):
# use only the lines with actual data and not commented
- spike_train = spike_train_from_string(line, separator, sort)
+ spike_train = spike_train_from_string(line, separator, is_sorted)
if time_interval is not None: # add auxil. spikes if times given
spike_train = add_auxiliary_spikes(spike_train, time_interval)
spike_trains.append(spike_train)