Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions qsiprep/cli/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,19 +105,19 @@ def _min_one(value, parser):
return value

def _int_or_auto(value, parser):
"""Ensure an argument is an integer or 'auto'."""
"""Ensure an argument is an odd integer >= 3 or 'auto'."""
if value.lower() == 'auto':
return value
return 'auto'
try:
value = int(value)
except ValueError as exc:
raise parser.error('Argument must be an integer or "auto".') from exc

if value < 1:
raise parser.error('Argument must be greater than zero.')
if value < 3:
raise parser.error('Argument must be an odd integer >= 3.')

if value % 2 == 0:
raise parser.error('Argument must be an odd integer.')
raise parser.error('Argument must be an odd integer >= 3.')

return value

Expand Down
3 changes: 2 additions & 1 deletion qsiprep/workflows/dwi/merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -445,11 +445,12 @@ def get_buffernode():

dwi_denoise_window = config.workflow.dwi_denoise_window
auto_str = ''
if denoise_method == 'dwidenoise' and config.workflow.dwi_denoise_window == 'auto':
if denoise_method == 'dwidenoise' and dwi_denoise_window == 'auto':
# Configure the denoising window
import numpy as np

dwi_denoise_window = closest_odd(int(np.ceil(np.cbrt(n_volumes))))
dwi_denoise_window = max(dwi_denoise_window, 3)
config.loggers.workflow.info(
f'Automatically using {dwi_denoise_window}, {dwi_denoise_window}, '
f'{dwi_denoise_window} window for dwidenoise'
Expand Down