diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2017-10-04 22:01:52 -0700 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2017-10-04 22:01:52 -0700 |
| commit | 2af020ee53a006436fb69bf80b28d5a850ae8c43 (patch) | |
| tree | 988d0be91bc678169fdc7934d5494dcf9f8f8768 /pyspike/__init__.py | |
| parent | 9fa10fe30e3216170f41ce47797c7a3a56e17a5f (diff) | |
| parent | de571efd0894f0332eadec7e4a2184f9a4ffaf25 (diff) | |
Merge branch 'master' of github.com:mariomulansky/PySpike
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 |