summaryrefslogtreecommitdiff
path: root/pyspike/spikes.py
diff options
context:
space:
mode:
Diffstat (limited to 'pyspike/spikes.py')
-rw-r--r--pyspike/spikes.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/pyspike/spikes.py b/pyspike/spikes.py
index 6b2eea3..70b48ff 100644
--- a/pyspike/spikes.py
+++ b/pyspike/spikes.py
@@ -7,6 +7,9 @@ Copyright 2014, Mario Mulansky <mario.mulansky@gmx.net>
import numpy as np
+############################################################
+# spike_train_from_string
+############################################################
def spike_train_from_string(s, sep=' '):
""" Converts a string of times into an array of spike times.
Params:
@@ -18,6 +21,9 @@ def spike_train_from_string(s, sep=' '):
return np.fromstring(s, sep=sep)
+############################################################
+# merge_spike_trains
+############################################################
def merge_spike_trains(spike_trains):
""" Merges a number of spike trains into a single spike train.
Params: