diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2016-06-18 16:32:39 -0700 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2016-06-18 16:32:39 -0700 |
| commit | a63839708d6574567bcd518a822a9f10629ed80b (patch) | |
| tree | 02c28e0856b62c08fd4d3622ee68d145d8eee6eb /pyspike/__init__.py | |
| parent | d9e2125dcc76693056ab04264add29227f398f4f (diff) | |
| parent | 4691d0e77a024fbc73d1098ee557d65f8f2ddc89 (diff) | |
Merge branch 'import_time_series' into develop
Conflicts:
pyspike/__init__.py
resolved
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 4d75786..08253fb 100644 --- a/pyspike/__init__.py +++ b/pyspike/__init__.py @@ -24,7 +24,8 @@ from .spike_sync import spike_sync_profile, spike_sync,\ from .psth import psth from .spikes import load_spike_trains_from_txt, save_spike_trains_to_txt, \ - spike_train_from_string, merge_spike_trains, generate_poisson_spikes + spike_train_from_string, import_spike_trains_from_time_series, \ + merge_spike_trains, generate_poisson_spikes # define the __version__ following # http://stackoverflow.com/questions/17583443 |