diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-29 12:35:51 +0200 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-29 12:35:51 +0200 |
| commit | ad29154d8c152996d16c012dcc5798c5f1957aed (patch) | |
| tree | f01575082a649061362178d4a9870cb5fe2c33f6 /pyspike/SpikeTrain.py | |
| parent | 1fa8493ce15af8cd4c057eece155f1557fc241ea (diff) | |
| parent | c17cc8602414cec883c412008a4300b2c7ac7f80 (diff) | |
Merge branch 'master' into new_directionality
Conflicts:
pyspike/__init__.py
pyspike/cython/cython_directionality.pyx
pyspike/cython/directionality_python_backend.py
pyspike/spike_directionality.py
setup.py
Diffstat (limited to 'pyspike/SpikeTrain.py')
| -rw-r--r-- | pyspike/SpikeTrain.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pyspike/SpikeTrain.py b/pyspike/SpikeTrain.py index 4b59a5d..19f2419 100644 --- a/pyspike/SpikeTrain.py +++ b/pyspike/SpikeTrain.py @@ -68,7 +68,7 @@ class SpikeTrain(object): """Returns the spikes of this spike train with auxiliary spikes in case of empty spike trains. """ - if len(self.spikes) < 2: + if len(self.spikes) < 1: return np.unique(np.insert([self.t_start, self.t_end], 1, self.spikes)) else: |