Merge remote-tracking branch 'upstream/master' into fix/CircleTests

Author: oesteban

nipype/interfaces/ants/segmentation.py

@@ -1129,11 +1129,28 @@ def _format_arg(self, opt, spec, val):
             retval = ''
             if not isdefined(self.inputs.out_label_fusion):
                 retval = '-o {0}'.format(self.inputs.out_intensity_fusion_name_format)
+        elif opt == 'atlas_image':
+            atlas_image_cmd=" ".join(
+                [ '-g [{0}]'.format(",".join(
+                    fn for fn in ai) ) for ai in self.inputs.atlas_image]
+            )
+            retval = atlas_image_cmd
+        elif opt == 'target_image':
+            target_image_cmd=" ".join(
+                [ '-t [{0}]'.format(",".join(
+                    fn for fn in ai) ) for ai in self.inputs.target_image]
+            )
+            retval = target_image_cmd
+        elif opt == 'atlas_segmentation_image':
+            assert len(val) == len(self.inputs.atlas_image), "Number of specified " \
+                "segmentations should be identical to the number of atlas image " \
+                "sets {0}!={1}".format(len(val), len(self.inputs.atlas_image))
+            atlas_segmentation_image_cmd=" ".join(
+                [ '-t [{0}]'.format( fn ) for fn in self.inputs.atlas_segmentation_image ]
+            )
+            retval = atlas_segmentation_image_cmd
         else:
-            if opt == 'atlas_segmentation_image':
-                assert len(val) == len(self.inputs.atlas_image), "Number of specified " \
-                    "segmentations should be identical to the number of atlas image " \
-                    "sets {0}!={1}".format(len(val), len(self.inputs.atlas_image))
+
             return super(ANTSCommand, self)._format_arg(opt, spec, val)
         return retval