diff options
author | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-29 12:40:04 +0200 |
---|---|---|
committer | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-29 12:40:04 +0200 |
commit | 9cf75c9f72a5bea6ed636d9624eff951a473dcde (patch) | |
tree | 5b288389f8794e94de7c76d89482329f88dc6305 /pyspike/__init__.py | |
parent | ad29154d8c152996d16c012dcc5798c5f1957aed (diff) | |
parent | d9e2125dcc76693056ab04264add29227f398f4f (diff) |
Merge branch 'develop' into new_directionality
Diffstat (limited to 'pyspike/__init__.py')
-rw-r--r-- | pyspike/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pyspike/__init__.py b/pyspike/__init__.py index 7f578b0..25e13eb 100644 --- a/pyspike/__init__.py +++ b/pyspike/__init__.py @@ -24,8 +24,8 @@ from .spike_sync import spike_sync_profile, spike_sync,\ filter_by_spike_sync from .psth import psth -from .spikes import load_spike_trains_from_txt, spike_train_from_string, \ - merge_spike_trains, generate_poisson_spikes +from .spikes import load_spike_trains_from_txt, save_spike_trains_to_txt, \ + spike_train_from_string, merge_spike_trains, generate_poisson_spikes from .spike_directionality import spike_directionality, \ spike_directionality_profiles, spike_directionality_matrix, \ |