Skip to content

Commit 09e6462

Browse files
committed
destripe cbin: expose k_kwargs and b_kwargs as parameteres
1 parent 05d127a commit 09e6462

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

ibllib/dsp/voltage.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,8 @@ def destripe(x, fs, neuropixel_version=1, butter_kwargs=None, k_kwargs=None, cha
275275

276276

277277
def decompress_destripe_cbin(sr_file, output_file=None, h=None, wrot=None, append=False, nc_out=None, butter_kwargs=None,
278-
dtype=np.int16, ns2add=0, nbatch=None, nprocesses=None, compute_rms=True, reject_channels=True):
278+
dtype=np.int16, ns2add=0, nbatch=None, nprocesses=None, compute_rms=True, reject_channels=True,
279+
k_kwargs=None):
279280
"""
280281
From a spikeglx Reader object, decompresses and apply ADC.
281282
Saves output as a flat binary file in int16
@@ -295,6 +296,7 @@ def decompress_destripe_cbin(sr_file, output_file=None, h=None, wrot=None, appen
295296
interp 3:outside of brain and discard
296297
:param reject_channels: (True) detects noisy or bad channels and interpolate them. Channels outside of the brain are left
297298
untouched
299+
:param k_kwargs: (True) arguments for the kfilter function
298300
:return:
299301
"""
300302
import pyfftw
@@ -306,9 +308,11 @@ def decompress_destripe_cbin(sr_file, output_file=None, h=None, wrot=None, appen
306308
if reject_channels: # get bad channels if option is on
307309
channel_labels = detect_bad_channels_cbin(sr)
308310
assert isinstance(sr_file, str) or isinstance(sr_file, Path)
309-
butter_kwargs = butter_kwargs or {'N': 3, 'Wn': 300 / sr.fs * 2, 'btype': 'highpass'}
310-
k_kwargs = {'ntr_pad': 60, 'ntr_tap': 0, 'lagc': 3000,
311-
'butter_kwargs': {'N': 3, 'Wn': 0.01, 'btype': 'highpass'}}
311+
if butter_kwargs is None:
312+
butter_kwargs = butter_kwargs or {'N': 3, 'Wn': 300 / sr.fs * 2, 'btype': 'highpass'}
313+
if k_kwargs is None:
314+
k_kwargs = {'ntr_pad': 60, 'ntr_tap': 0, 'lagc': 3000,
315+
'butter_kwargs': {'N': 3, 'Wn': 0.01, 'btype': 'highpass'}}
312316
h = neuropixel.trace_header(version=1) if h is None else h
313317
ncv = h['sample_shift'].size # number of channels
314318
output_file = sr.file_bin.with_suffix('.bin') if output_file is None else output_file

0 commit comments

Comments
 (0)