Skip to content

Commit 0e31778

Browse files
committed
RF: Convert recon_method none to Nonetype
1 parent 73a3e21 commit 0e31778

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

nibabies/cli/parser.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,11 @@ def _slice_time_ref(value, parser):
150150
raise parser.error(f'Slice time reference must be in range 0-1. Received {value}.')
151151
return value
152152

153+
def _str_none(val):
154+
if not isinstance(val, str):
155+
return val
156+
return None if val.lower() == 'none' else val
157+
153158
verstr = f'NiBabies v{config.environment.version}'
154159
currentv = Version(config.environment.version)
155160

@@ -757,7 +762,8 @@ def _slice_time_ref(value, parser):
757762
)
758763
g_baby.add_argument(
759764
'--surface-recon-method',
760-
choices=('auto', 'infantfs', 'freesurfer', 'mcribs', 'none'),
765+
choices=('auto', 'infantfs', 'freesurfer', 'mcribs', None),
766+
type=_str_none,
761767
default='auto',
762768
help='Method to use for surface reconstruction.',
763769
)

nibabies/workflows/base.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ def init_nibabies_wf(subworkflows_list):
108108
nibabies_wf.base_dir = config.execution.work_dir
109109

110110
execution_spaces = init_execution_spaces()
111-
freesurfer = config.workflow.surface_recon_method is not None
112-
if freesurfer:
111+
surface_recon = config.workflow.surface_recon_method is not None
112+
if surface_recon:
113113
fsdir = pe.Node(
114114
BIDSFreeSurferDir(
115115
derivatives=config.execution.output_dir,
@@ -157,7 +157,7 @@ def init_nibabies_wf(subworkflows_list):
157157
single_subject_wf.config['execution']['crashdump_dir'] = str(log_dir)
158158
for node in single_subject_wf._get_all_nodes():
159159
node.config = deepcopy(single_subject_wf.config)
160-
if freesurfer:
160+
if surface_recon:
161161
nibabies_wf.connect(fsdir, 'subjects_dir', single_subject_wf, 'inputnode.subjects_dir')
162162
else:
163163
nibabies_wf.add_nodes([single_subject_wf])

0 commit comments

Comments
 (0)