update dwibiascorrect

Author: josephmje

nipype/interfaces/mrtrix3/preprocess.py

@@ -179,27 +179,16 @@ class DWIBiasCorrectInputSpec(MRTrix3BaseInputSpec):
     in_mask = File(
         argstr='-mask %s',
         desc='input mask image for bias field estimation')
-    _xor_methods = ('use_ants', 'use_fsl')
     use_ants = traits.Bool(
-        default_value=True,
-        usedefault=True,
         argstr='-ants',
         desc='use ANTS N4 to estimate the inhomogeneity field',
-        xor=_xor_methods)
+        xor=['use_fsl'])
     use_fsl = traits.Bool(
         argstr='-fsl',
         desc='use FSL FAST to estimate the inhomogeneity field',
-        xor=_xor_methods,
+        xor=['use_ants'],
         min_ver='5.0.10')
-    _xor_grads = ('mrtrix_grad', 'fsl_grad')
-    mrtrix_grad = File(
-        argstr='-grad %s',
-        desc='diffusion gradient table in MRtrix format',
-        xor=_xor_grads)
-    fsl_grad = File(
-        argstr='-fslgrad %s %s',
-        desc='diffusion gradient table in FSL bvecs/bvals format',
-        xor=_xor_grads)
+    _xor_grads = ('grad_file', 'grad_fsl')
     bias = File(
         argstr='-bias %s',
         desc='bias field')
@@ -237,13 +226,6 @@ class DWIBiasCorrect(MRTrix3Base):
     input_spec = DWIBiasCorrectInputSpec
     output_spec = DWIBiasCorrectOutputSpec
 
-    def _list_outputs(self):
-        outputs = self.output_spec().get()
-        outputs['out_file'] = op.abspath(self.inputs.out_file)
-        if self.inputs.bias != Undefined:
-            outputs['bias'] = op.abspath(self.inputs.bias)
-        return outputs
-
 
 class ResponseSDInputSpec(MRTrix3BaseInputSpec):
     algorithm = traits.Enum(

nipype/interfaces/mrtrix3/tests/test_auto_DWIBiasCorrect.py

@@ -15,11 +15,6 @@ def test_DWIBiasCorrect_inputs():
             nohash=True,
             usedefault=True,
         ),
-        fsl_grad=dict(
-            argstr='-fslgrad %s %s',
-            extensions=None,
-            xor=('mrtrix_grad', 'fsl_grad'),
-        ),
         grad_file=dict(
             argstr='-grad %s',
             extensions=None,
@@ -40,11 +35,6 @@ def test_DWIBiasCorrect_inputs():
             argstr='-mask %s',
             extensions=None,
         ),
-        mrtrix_grad=dict(
-            argstr='-grad %s',
-            extensions=None,
-            xor=('mrtrix_grad', 'fsl_grad'),
-        ),
         nthreads=dict(
             argstr='-nthreads %d',
             nohash=True,
@@ -60,13 +50,12 @@ def test_DWIBiasCorrect_inputs():
         ),
         use_ants=dict(
             argstr='-ants',
-            usedefault=True,
-            xor=('use_ants', 'use_fsl'),
+            xor=['use_fsl'],
         ),
         use_fsl=dict(
             argstr='-fsl',
             min_ver='5.0.10',
-            xor=('use_ants', 'use_fsl'),
+            xor=['use_ants'],
         ),
     )
     inputs = DWIBiasCorrect.input_spec()