Merge Multiple Spiketrains#652

Merged

JuliaSprenger merged 18 commits intoNeuralEnsemble:masterfrom

INM-6:enh/merge_multiple_spiketrains

Feb 18, 2020

Commits on Feb 26, 2019

Added the possibility to merge multiple spiketrains into an existing one with spiketrain.merge while preserving the previous functionality for merging a pair of spiketrains.
kleinjohann
committed

Commits on Feb 28, 2019

Fixed typos resulting in undesired error types
kleinjohann
committed
Fixed waveform units being reset to dimensionless
kleinjohann
committed
Added functionality to merge multiple BaseNeo objects and to merge annotations of multiple objects
kleinjohann
committed
Added unittests for merging multiple BaseNeo objects and for merging annotations of multiple neo objects
kleinjohann
committed
Added unittests for merging multiple spiketrains
kleinjohann
committed
Cleanup
kleinjohann
committed
Merge branch 'master' of github.com:NeuralEnsemble/python-neo into enh/merge_multiple_spiketrains
kleinjohann
committed
pep8
kleinjohann
committed
wrong pep8 version
kleinjohann
committed

Commits on Mar 1, 2019

Fixed name, description and file_origin attributes
kleinjohann
committed

Commits on Mar 3, 2019

Commits on Apr 10, 2019

Change type check to isinstance
kleinjohann
committed

Commits on Sep 16, 2019

Remove ability to merge proxies into regular spiketrains
kleinjohann
committed

Commits on Feb 7, 2020

Fix not all spiketrains' annotations being merged
kleinjohann
committed
Merge branch 'NeuralEnsemble/master' into enh/merge_multiple_spiketrains
kleinjohann
committed