Merge remote-tracking branch 'upstream/master' into enh/restingconn

* upstream/master:
  fix: spm requires CmdLine to be lowercase
  fix: close figures when using spm with mcr
  add test
  remove unecessary changes
  Minor edits in resampling interfaces

Author: satra

nipype/interfaces/ants/resampling.py

@@ -130,11 +130,11 @@ class WarpImageMultiTransformInputSpec(ANTSCommandInputSpec):
                                           'with additional transforms'))
     use_nearest = traits.Bool(argstr='--use-NN',
                               desc='Use nearest neighbor interpolation')
-    use_bspline = traits.Bool(argstr='--use-Bspline',
+    use_bspline = traits.Bool(argstr='--use-BSpline',
                               desc='Use 3rd order B-Spline interpolation')
     transformation_series = InputMultiPath(File(exists=True), argstr='%s',
                                            desc='transformation file(s) to be applied',
-                                           mandatory=True)
+                                           mandatory=True, position=-1)
     invert_affine = traits.List(traits.Int,
                                 desc=('List of Affine transformations to invert.'
                                       'E.g.: [1,4,5] inverts the 1st, 4th, and 5th Affines '

nipype/interfaces/ants/tests/test_auto_WarpImageMultiTransform.py

@@ -46,8 +46,9 @@ def test_WarpImageMultiTransform_inputs():
     ),
     transformation_series=dict(argstr='%s',
     mandatory=True,
+    position=-1,
     ),
-    use_bspline=dict(argstr='--use-Bspline',
+    use_bspline=dict(argstr='--use-BSpline',
     ),
     use_nearest=dict(argstr='--use-NN',
     ),

nipype/interfaces/spm/base.py

@@ -468,7 +468,7 @@ def _make_matlab_command(self, contents, postscript=None):
 
         if strcmp(name, 'SPM8') || strcmp(name, 'SPM12b'),
            spm_jobman('initcfg');
-           spm_get_defaults('CmdLine', 1);
+           spm_get_defaults('cmdline', 1);
         end\n
         """
         if self.mlab.inputs.mfile:
@@ -499,6 +499,12 @@ def _make_matlab_command(self, contents, postscript=None):
         mscript += """
         spm_jobman(\'run\', jobs);\n
         """
+        if self.inputs.use_mcr:
+            mscript += """
+        if strcmp(name, 'SPM8') || strcmp(name, 'SPM12b'),
+            close(\'all\', \'force\');
+        end;
+            """
         if postscript is not None:
             mscript += postscript
         return mscript