diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2014-09-29 12:55:56 +0200 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2014-09-29 12:55:56 +0200 |
| commit | e4f1c09672068e4778f7b5f3e27b47ff8986863c (patch) | |
| tree | a6550b5f2683d1e9537a5fb250e3513a85719697 /pyspike/spikes.py | |
| parent | fa6b1e375eb8a4b93582d2935352447849e66203 (diff) | |
+mul_scalar, tests restructured and cosmetics
Diffstat (limited to 'pyspike/spikes.py')
| -rw-r--r-- | pyspike/spikes.py | 6 |
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: |