Merge remote-tracking branch 'upstream/master' into docs/neurodocker

Author: Jakub Kaczmarzyk

.zenodo.json

@@ -609,6 +609,11 @@
     {
       "affiliation": "Vrije Universiteit Amsterdam",
       "name": "Ort, Eduard"
+    },
+    {
+      "affiliation": "Technical University Munich",
+      "name": "Molina-Romero, Miguel",
+      "orcid": "0000-0001-8054-0426"
     }
   ],
   "keywords": [

nipype/interfaces/freesurfer/model.py

@@ -1144,7 +1144,7 @@ class Label2VolInputSpec(FSTraitedSpec):
     invert_mtx = traits.Bool(
         argstr='--invertmtx', desc='Invert the registration matrix')
     fill_thresh = traits.Range(
-        0., 1., argstr='--fillthresh %.f', desc='thresh : between 0 and 1')
+        0., 1., argstr='--fillthresh %g', desc='thresh : between 0 and 1')
     label_voxel_volume = traits.Float(
         argstr='--labvoxvol %f', desc='volume of each label point (def 1mm3)')
     proj = traits.Tuple(
@@ -1183,7 +1183,7 @@ class Label2Vol(FSCommand):
 
     >>> binvol = Label2Vol(label_file='cortex.label', template_file='structural.nii', reg_file='register.dat', fill_thresh=0.5, vol_label_file='foo_out.nii')
     >>> binvol.cmdline
-    'mri_label2vol --fillthresh 0 --label cortex.label --reg register.dat --temp structural.nii --o foo_out.nii'
+    'mri_label2vol --fillthresh 0.5 --label cortex.label --reg register.dat --temp structural.nii --o foo_out.nii'
 
    """
 

nipype/interfaces/freesurfer/tests/test_auto_Label2Vol.py

@@ -22,7 +22,7 @@ def test_Label2Vol_inputs():
             nohash=True,
             usedefault=True,
         ),
-        fill_thresh=dict(argstr='--fillthresh %.f', ),
+        fill_thresh=dict(argstr='--fillthresh %g', ),
         hemi=dict(argstr='--hemi %s', ),
         identity=dict(
             argstr='--identity',