modified afni's cat_matvec to accept empty string opposed to opkey

Author: ostanley

nipype/interfaces/afni/utils.py

@@ -619,12 +619,21 @@ class CatMatvec(AFNICommand):
 
     def _format_arg(self, name, spec, value):
         if name == 'in_file':
+<<<<<<< HEAD
             # Concatenate a series of filenames, with optional opkeys
             return ' '.join('%s -%s' % (mfile, opkey) if opkey else mfile
                            for mfile, opkey in value)
+=======
+            xfm_args=''
+            for v in value:
+                if len(v[1])>0:
+                    xfm_args += ' ' +  v[0] + ' -' + v[1] + ' '
+                else:
+                    xfm_args += ' ' + v[0] + ' '
+            return spec.argstr % (xfm_args)
+>>>>>>> modified afni's cat_matvec to accept empty string opposed to opkey
         return super(CatMatvec, self)._format_arg(name, spec, value)
 
-
 class CenterMassInputSpec(CommandLineInputSpec):
     in_file = File(
         desc='input file to 3dCM',