Merge pull request #1266 from hanke/dcm2nii_philips_dwi

Adjust expected bvecs/bvals filenames for the Philips DWI case

Author: satra

nipype/interfaces/dcm2nii.py

@@ -124,6 +124,13 @@ def _parse_stdout(self, stdout):
                         base, filename, ext = split_filename(last_added_file)
                         bvecs.append(os.path.join(base, filename + ".bvec"))
                         bvals.append(os.path.join(base, filename + ".bval"))
+                elif line.startswith("Removed DWI from DTI scan"):
+                    # such line can only follow the 'diffusion' case handled
+                    # just above
+                    for l in (bvecs, bvals):
+                        l[-1] = os.path.join(
+                            os.path.dirname(l[-1]),
+                            'x%s' % (os.path.basename(l[-1]),))
                 elif re.search('.*->(.*)', line):
                     val = re.search('.*->(.*)', line)
                     val = val.groups()[0]