FIX: T2/FLAIR inputs not mutually exclusive

Author: effigies

nipype/interfaces/freesurfer/preprocess.py

@@ -629,10 +629,10 @@ class ReconAllInputSpec(CommandLineInputSpec):
     T1_files = InputMultiPath(File(exists=True), argstr='-i %s...',
                               desc='name of T1 file to process')
     T2_file = File(exists=True, argstr="-T2 %s",
-                   min_ver='5.3.0', xor=['FLAIR_file'],
+                   min_ver='5.3.0',
                    desc='Convert T2 image to orig directory')
     FLAIR_file = File(exists=True, argstr="-FLAIR %s",
-                      min_ver='5.3.0', xor=['T2_file'],
+                      min_ver='5.3.0',
                       desc='Convert FLAIR image to orig directory')
     use_T2 = traits.Bool(argstr="-T2pial", min_ver='5.3.0', xor=['use_FLAIR'],
                          desc='Use T2 image to refine the pial surface')

nipype/interfaces/freesurfer/tests/test_auto_ReconAll.py

@@ -6,13 +6,11 @@
 def test_ReconAll_inputs():
     input_map = dict(FLAIR_file=dict(argstr='-FLAIR %s',
     min_ver='5.3.0',
-    xor=['T2_file'],
     ),
     T1_files=dict(argstr='-i %s...',
     ),
     T2_file=dict(argstr='-T2 %s',
     min_ver='5.3.0',
-    xor=['FLAIR_file'],
     ),
     args=dict(argstr='%s',
     ),