From 3a90ffbe8ad9a8c4d070cf4108d6d522930d750f Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Tue, 14 Feb 2017 16:52:28 -0500 Subject: [PATCH] Unset default init for BBRegister in FS 6+ --- nipype/interfaces/freesurfer/preprocess.py | 4 ++-- nipype/interfaces/freesurfer/tests/test_auto_BBRegister.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nipype/interfaces/freesurfer/preprocess.py b/nipype/interfaces/freesurfer/preprocess.py index f13c8a717c..0bc90af462 100644 --- a/nipype/interfaces/freesurfer/preprocess.py +++ b/nipype/interfaces/freesurfer/preprocess.py @@ -944,7 +944,7 @@ class BBRegisterInputSpec(FSTraitedSpec): class BBRegisterInputSpec6(BBRegisterInputSpec): init = traits.Enum('coreg', 'rr', 'spm', 'fsl', 'header', 'best', argstr='--init-%s', - usedefault=True, xor=['init_reg_file'], + xor=['init_reg_file'], desc='initialize registration with mri_coreg, spm, fsl, or header') @@ -974,7 +974,7 @@ class BBRegister(FSCommand): """ _cmd = 'bbregister' - if LooseVersion(FSVersion) < LooseVersion("6.0.0"): + if FSVersion and LooseVersion(FSVersion) < LooseVersion("6.0.0"): input_spec = BBRegisterInputSpec else: input_spec = BBRegisterInputSpec6 diff --git a/nipype/interfaces/freesurfer/tests/test_auto_BBRegister.py b/nipype/interfaces/freesurfer/tests/test_auto_BBRegister.py index 58d9bcd21d..61e88553a7 100644 --- a/nipype/interfaces/freesurfer/tests/test_auto_BBRegister.py +++ b/nipype/interfaces/freesurfer/tests/test_auto_BBRegister.py @@ -17,7 +17,6 @@ def test_BBRegister_inputs(): usedefault=True, ), init=dict(argstr='--init-%s', - mandatory=True, xor=[u'init_reg_file'], ), init_reg_file=dict(argstr='--init-reg %s',