diff options
author | Mario Mulansky <mario.mulansky@gmx.net> | 2015-12-14 17:25:53 +0100 |
---|---|---|
committer | Mario Mulansky <mario.mulansky@gmx.net> | 2015-12-14 17:25:53 +0100 |
commit | f7b90618f01d4dbf015b3d21c6c06dec8d26bd9f (patch) | |
tree | 799a2fa0e0f7558ece400de15ca8d1358565c066 /pyspike/spikes.py | |
parent | d985f3a8de6ae840c8a127653b3d9affb1a8aa40 (diff) | |
parent | 9061f2a0c13134e53f937d730295a421fd671ea3 (diff) |
Merge pull request #20 from mariomulansky/develop
Develop merge for version 0.4
Diffstat (limited to 'pyspike/spikes.py')
-rw-r--r-- | pyspike/spikes.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pyspike/spikes.py b/pyspike/spikes.py index 35d8533..b18d7eb 100644 --- a/pyspike/spikes.py +++ b/pyspike/spikes.py @@ -28,7 +28,8 @@ def spike_train_from_string(s, edges, sep=' ', is_sorted=False): # load_spike_trains_txt ############################################################ def load_spike_trains_from_txt(file_name, edges, - separator=' ', comment='#', is_sorted=False): + separator=' ', comment='#', is_sorted=False, + ignore_empty_lines=True): """ 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 |