Merge pull request #959 from mick-d/dcm2nii

Added directory support to Dcm2nii

Author: chrisgorgo

nipype/interfaces/dcm2nii.py

@@ -18,7 +18,9 @@
 
 class Dcm2niiInputSpec(CommandLineInputSpec):
     source_names = InputMultiPath(File(exists=True), argstr="%s", position=-1,
-                                  copyfile=False, mandatory=True)
+                                  copyfile=False, mandatory=True, xor=['source_dir'])
+    source_dir = Directory(exists=True, argstr="%s", position=-1, mandatory=True,
+                           xor=['source_names'])
     anonymize = traits.Bool(True, argstr='-a', usedefault=True)
     config_file = File(exists=True, argstr="-b %s", genfile=True)
     collapse_folders = traits.Bool(True, argstr='-c', usedefault=True)

nipype/interfaces/tests/test_auto_Dcm2nii.py

@@ -49,13 +49,19 @@ def test_Dcm2nii_inputs():
     reorient_and_crop=dict(argstr='-x',
     usedefault=True,
     ),
+    source_dir=dict(argstr='%s',
+    mandatory=True,
+    position=-1,
+    xor=['source_names'],
+    ),
     source_in_filename=dict(argstr='-f',
     usedefault=True,
     ),
     source_names=dict(argstr='%s',
     copyfile=False,
     mandatory=True,
     position=-1,
+    xor=['source_dir'],
     ),
     spm_analyze=dict(argstr='-s',
     xor=['nii_output'],