diff options
author | Mario Mulansky <mario.mulansky@gmx.net> | 2017-10-04 21:56:40 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-04 21:56:40 -0700 |
commit | de571efd0894f0332eadec7e4a2184f9a4ffaf25 (patch) | |
tree | 0e6bf7b745a5baae0bee0a4d8a2873c8ca4bef85 /pyspike/__init__.py | |
parent | f4ea757a1a32be3df440b4d742cafd5036544225 (diff) | |
parent | ecd4b5f0f7e93859c1262593e2c09e1eb6775819 (diff) |
Merge pull request #27 from mariomulansky/develop
Merge v 0.5.2
Diffstat (limited to 'pyspike/__init__.py')
-rw-r--r-- | pyspike/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pyspike/__init__.py b/pyspike/__init__.py index 069090b..08253fb 100644 --- a/pyspike/__init__.py +++ b/pyspike/__init__.py @@ -23,7 +23,8 @@ 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 load_spike_trains_from_txt, spike_train_from_string, \ +from .spikes import load_spike_trains_from_txt, save_spike_trains_to_txt, \ + spike_train_from_string, import_spike_trains_from_time_series, \ merge_spike_trains, generate_poisson_spikes # define the __version__ following |