Skip to content

Commit 964f8dc

Browse files
authored
Merge branch 'main' into fix-node-pipeline
2 parents 47e1839 + c5d3055 commit 964f8dc

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ extractors = [
6262
"MEArec>=1.8",
6363
"pynwb>=2.6.0",
6464
"hdmf-zarr>=0.11.0",
65-
"pyedflib>=0.1.30",
65+
"pyedflib>=0.1.30,<0.1.39",
6666
"sonpy;python_version<'3.10'",
6767
"lxml", # lxml for neuroscope
6868
"scipy",

src/spikeinterface/sorters/external/kilosort.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ def _get_specific_options(cls, ops, params) -> dict:
206206

207207
# options for posthoc merges (under construction)
208208
ops["fracse"] = 0.1 # binning step along discriminant axis for posthoc merges (in units of sd)
209-
ops["epu"] = np.Inf
209+
ops["epu"] = np.inf
210210

211211
ops["ForceMaxRAMforDat"] = 20e9 # maximum RAM the algorithm will try to use; on Windows it will autodetect.
212212

src/spikeinterface/sorters/external/kilosortbase.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def _generate_ops_file(cls, recording, params, sorter_output_folder, binary_file
9696
ops["fbinary"] = str(binary_file_path.absolute()) # will be created for 'openEphys'
9797
ops["fproc"] = str((sorter_output_folder / "temp_wh.dat").absolute()) # residual from RAM of preprocessed data
9898
ops["root"] = str(sorter_output_folder.absolute()) # 'openEphys' only: where raw files are
99-
ops["trange"] = [0, np.Inf] # time range to sort
99+
ops["trange"] = [0, np.inf] # time range to sort
100100
ops["chanMap"] = str((sorter_output_folder / "chanMap.mat").absolute())
101101

102102
ops["fs"] = recording.get_sampling_frequency() # sample rate

0 commit comments

Comments
 (0)