diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2015-04-30 14:23:14 +0200 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2015-04-30 14:23:14 +0200 |
| commit | 88c18727290d81ce6f6ff66862cea6da241c7c34 (patch) | |
| tree | 47d1922a621becc87a4573fca9feb4acef821432 /pyspike/__init__.py | |
| parent | 1b9f4ec0aee1281464cfcab02bb4c7c302dbbb00 (diff) | |
| parent | 26d4dd11f80b1c0b4ab19e7cb74c77b61eaad90c (diff) | |
Merge pull request #4 from mariomulansky/develop0.2.0
merge develop
Diffstat (limited to 'pyspike/__init__.py')
| -rw-r--r-- | pyspike/__init__.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pyspike/__init__.py b/pyspike/__init__.py index 4d3f9f6..a5f9f0a 100644 --- a/pyspike/__init__.py +++ b/pyspike/__init__.py @@ -5,12 +5,13 @@ Distributed under the BSD License """ __all__ = ["isi_distance", "spike_distance", "spike_sync", "psth", - "spikes", "PieceWiseConstFunc", "PieceWiseLinFunc", + "spikes", "SpikeTrain", "PieceWiseConstFunc", "PieceWiseLinFunc", "DiscreteFunc"] from PieceWiseConstFunc import PieceWiseConstFunc from PieceWiseLinFunc import PieceWiseLinFunc from DiscreteFunc import DiscreteFunc +from SpikeTrain import SpikeTrain from isi_distance import isi_profile, isi_distance, isi_profile_multi,\ isi_distance_multi, isi_distance_matrix @@ -20,5 +21,5 @@ from spike_sync import spike_sync_profile, spike_sync,\ spike_sync_profile_multi, spike_sync_multi, spike_sync_matrix from psth import psth -from spikes import add_auxiliary_spikes, load_spike_trains_from_txt, \ - spike_train_from_string, merge_spike_trains, generate_poisson_spikes +from spikes import load_spike_trains_from_txt, spike_train_from_string, \ + merge_spike_trains, generate_poisson_spikes |