Skip to content

Commit a0925f1

Browse files
authored
Merge branch 'master' into merge_ap_lfp_neuropix
2 parents 8de09d7 + a52c128 commit a0925f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1489
-357
lines changed

doc/api.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ spikeinterface.preprocessing
149149
.. autofunction:: correct_lsb
150150
.. autofunction:: detect_bad_channels
151151
.. autofunction:: filter
152+
.. autofunction:: highpass_filter
152153
.. autofunction:: highpass_spatial_filter
153154
.. autofunction:: interpolate_bad_channels
154155
.. autofunction:: normalize_by_quantile
@@ -159,6 +160,7 @@ spikeinterface.preprocessing
159160
.. autofunction:: scale
160161
.. autofunction:: whiten
161162
.. autofunction:: zero_channel_pad
163+
.. autofunction:: zscore
162164

163165

164166
spikeinterface.postprocessing

doc/index.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Welcome to SpikeInterface's documentation!
77
:align: center
88

99

10-
Spikeinterface is a Python module to analyze extracellular electrophysiology data.
10+
SpikeInterface is a Python module to analyze extracellular electrophysiology data.
1111

1212
With a few lines of code, SpikeInterface enables you to load and pre-process the recording, run several
1313
state-of-the-art spike sorters, post-process and curate the output, compute quality metrics, and visualize the results.
@@ -29,7 +29,7 @@ SpikeInterface is made of several modules to deal with different aspects of the
2929
- compare and benchmark spike sorting outputs.
3030
- compute quality metrics to validate and curate spike sorting outputs.
3131
- visualize recordings and spike sorting outputs.
32-
- export report and export to Phy.
32+
- export a report and/or export to Phy.
3333
- offer a powerful Qt-based viewer in a separate package `spikeinterface-gui <https://https://github.com/SpikeInterface/spikeinterface-gui>`_
3434
- have some powerful sorting components to build your own sorter.
3535

@@ -63,7 +63,7 @@ To get started with SpikeInterface, you can take a look at the following additio
6363
| figures of SpikeInterface-based papers and to showcase the latest features of SpikeInterface.
6464
6565
- | The `2020 eLife paper <https://elifesciences.org/articles/61834>`_ introduces the concept and motivation and
66-
| performs an in-depth comparison of multiple sorters (spolier alert: they strongly disagree between each other!).
66+
| performs an in-depth comparison of multiple sorters (spoiler alert: they strongly disagree with each other!).
6767
| **Note**: the code-base and implementation have changed a lot since the "paper" version published in 2020.
6868
| For detailed documentation we therefore suggest more recent resources, like this documentation and :code:`spiketutorials`.
6969

doc/install_sorters.rst

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ Installing Spike Sorters
44
========================
55

66

7-
An important aspect of spikeinterface is the :py:mod:`spikeinterface.sorters` module.
7+
An important aspect of SpikeInterface is the :py:mod:`spikeinterface.sorters` module.
88
This module wraps many popular spike sorting tools, allowing you to run multiple sorters on the same dataset with
99
only a few lines of code and through Python.
1010

1111
Installing spike sorters can be painful! Many of them come with several requirements that could cause conflicts in
12-
your Python environment. To make things easier, we have created docker images for most of these sorters,
13-
and in many cases the easiest way to run them is to do so via docker or singularity.
12+
your Python environment. To make things easier, we have created Docker images for most of these sorters,
13+
and in many cases the easiest way to run them is to do so via Docker or Singularity.
1414
**This is the approach we recommend for all users.**
1515
To run containerized sorters see our documentation here: :ref:`containerizedsorters`.
1616

1717
There are some cases where users will need to install the spike sorting algorithms in their own environment. If you
18-
are on a system where it is infeasible to run docker or singularity containers, or if you are actively developing the
18+
are on a system where it is infeasible to run Docker or Singularity containers, or if you are actively developing the
1919
spike sorting software, you will likely need to install each spike sorter yourself.
2020

2121
Some of theses sorters are written in Matlab, so you will also need to install Matlab if you want
@@ -50,6 +50,7 @@ Herdingspikes2
5050

5151
pip install herdingspikes
5252

53+
5354
HDSort
5455
^^^^^^
5556

@@ -62,18 +63,20 @@ HDSort
6263
# provide installation path by setting the HDSORT_PATH environment variable
6364
# or using HDSortSorter.set_hdsort_path()
6465

66+
6567
IronClust
6668
^^^^^^^^^
6769

6870
* Matlab
6971
* Url: https://github.com/jamesjun/ironclust
7072
* Authors: James J. Jun
71-
* Installation need Matlab::
73+
* Installation needs Matlab::
7274

7375
git clone https://github.com/jamesjun/ironclust
7476
# provide installation path by setting the IRONCLUST_PATH environment variable
7577
# or using IronClustSorter.set_ironclust_path()
7678

79+
7780
Kilosort
7881
^^^^^^^^
7982

@@ -86,7 +89,8 @@ Kilosort
8689
# provide installation path by setting the KILOSORT_PATH environment variable
8790
# or using KilosortSorter.set_kilosort_path()
8891

89-
* See also for Matlab/cuda: https://www.mathworks.com/help/parallel-computing/gpu-support-by-release.html
92+
* See also for Matlab/CUDA: https://www.mathworks.com/help/parallel-computing/gpu-support-by-release.html
93+
9094

9195
Kilosort2
9296
^^^^^^^^^
@@ -100,7 +104,7 @@ Kilosort2
100104
# provide installation path by setting the KILOSORT2_PATH environment variable
101105
# or using Kilosort2Sorter.set_kilosort2_path()
102106

103-
* See also for Matlab/cuda: https://www.mathworks.com/help/parallel-computing/gpu-support-by-release.html
107+
* See also for Matlab/CUDA: https://www.mathworks.com/help/parallel-computing/gpu-support-by-release.html
104108

105109

106110
Kilosort2.5
@@ -115,7 +119,8 @@ Kilosort2.5
115119
# provide installation path by setting the KILOSORT2_5_PATH environment variable
116120
# or using Kilosort2_5Sorter.set_kilosort2_path()
117121

118-
* See also for Matlab/cuda: https://www.mathworks.com/help/parallel-computing/gpu-support-by-release.html
122+
* See also for Matlab/CUDA: https://www.mathworks.com/help/parallel-computing/gpu-support-by-release.html
123+
119124

120125
Kilosort3
121126
^^^^^^^^^
@@ -129,12 +134,13 @@ Kilosort3
129134
# provide installation path by setting the KILOSORT3_PATH environment variable
130135
# or using Kilosort3Sorter.set_kilosort3_path()
131136

132-
* See also for Matlab/cuda: https://www.mathworks.com/help/parallel-computing/gpu-support-by-release.html
137+
* See also for Matlab/CUDA: https://www.mathworks.com/help/parallel-computing/gpu-support-by-release.html
138+
133139

134140
pyKilosort
135141
^^^^^^^^^^
136142

137-
* Python, requires cuda
143+
* Python, requires CUDA
138144
* Url: https://github.com/int-brain-lab/pykilosort / https://github.com/MouseLand/pykilosort
139145
* Authors: Marius Pachitariu, Shashwat Sridhar, Alexander Morley, Cyrille Rossant, Kush Bunga
140146

@@ -175,10 +181,9 @@ Mountainsort4
175181
pip install mountainsort4
176182

177183

178-
SpykingCircus
184+
SpyKING CIRCUS
179185
^^^^^^^^^^^^^
180186

181-
182187
* Python, requires MPICH
183188
* Url: https://spyking-circus.readthedocs.io
184189
* Authors: Pierre Yger, Olivier Marre
@@ -201,12 +206,13 @@ Tridesclous
201206

202207
* Optional installation of opencl ICD and pyopencl for hardware acceleration::
203208

204-
sudo apt-get install beignet (optional if intel GPU)
205-
sudo apt-get install nvidia-opencl-XXX (optional if nvidia GPU)
209+
sudo apt-get install beignet (optional if Intel GPU)
210+
sudo apt-get install nvidia-opencl-XXX (optional if NVIDIA GPU)
206211
sudo apt-get install pocl-opencl-icd (optional for multi core CPU)
207212
sudo apt-get install opencl-headers ocl-icd-opencl-dev libclc-dev ocl-icd-libopencl1
208213
pip install pyopencl
209214

215+
210216
Waveclus
211217
^^^^^^^^
212218

@@ -250,11 +256,11 @@ Klusta (LEGACY)
250256

251257
* See also: https://github.com/kwikteam/phy
252258

259+
253260
Yass (LEGACY)
254261
^^^^^^^^^^^^^
255262

256-
257-
* Python, cuda, torch
263+
* Python, CUDA, torch
258264
* Requires SpikeInterface<0.96.0 (and Python 3.7)
259265
* Url: https://github.com/paninski-lab/yass
260266
* Authors: JinHyung Lee, Catalin Mitelut, Liam Paninski
@@ -286,4 +292,4 @@ working not only at peak times but at all times, recovering more spikes close to
286292

287293
pip install hdbscan
288294
pip install spikeinterface
289-
pip install numba (or conda install numba as recommended by conda authors)
295+
pip install numba (or conda install numba as recommended by conda authors)

0 commit comments

Comments
 (0)