@@ -552,7 +552,7 @@ class EddyInputSpec(FSLCommandInputSpec):
552552 default_value = 'eddy_corrected' ,
553553 usedefault = True ,
554554 argstr = '--out=%s' ,
555- desc = 'basename for output (warped) image' )
555+ desc = 'Basename for output image' )
556556 session = File (
557557 exists = True ,
558558 argstr = '--session=%s' ,
@@ -561,37 +561,39 @@ class EddyInputSpec(FSLCommandInputSpec):
561561 exists = True ,
562562 argstr = '--topup=%s' ,
563563 requires = ['in_topup_movpar' ],
564- desc = 'topup file containing the field coefficients' )
564+ desc = 'Topup results file containing the field coefficients' )
565565 in_topup_movpar = File (
566566 exists = True ,
567567 requires = ['in_topup_fieldcoef' ],
568- desc = 'topup movpar.txt file' )
568+ desc = 'Topup results file containing the movement parameters ' )
569569 field = File (
570570 argstr = '--field=%s' ,
571- desc = ('NonTOPUP fieldmap scaled in Hz - filename has '
572- 'to be provided without an extension. TOPUP is '
573- 'strongly recommended' ))
571+ desc = ('Non-topup derived fieldmap scaled in Hz' ))
574572 field_mat = File (
575573 exists = True ,
576574 argstr = '--field_mat=%s' ,
577- desc = ('Matrix that specifies the relative locations of '
578- 'the field specified by --field and first volume '
579- 'in file --imain' ))
575+ desc = ('Matrix specifying the relative positions of '
576+ 'the fieldmap, --field, and the first volume '
577+ 'of the input file, --imain' ))
580578
581579 flm = traits .Enum (
582- 'linear' ,
583580 'quadratic' ,
581+ 'linear' ,
584582 'cubic' ,
583+ usedefault = True ,
585584 argstr = '--flm=%s' ,
586585 desc = 'First level EC model' )
587586 slm = traits .Enum (
588587 'none' ,
589588 'linear' ,
590589 'quadratic' ,
590+ usedefault = True ,
591591 argstr = '--slm=%s' ,
592592 desc = 'Second level EC model' )
593593 fep = traits .Bool (
594- False , argstr = '--fep' , desc = 'Fill empty planes in x- or y-directions' )
594+ False ,
595+ argstr = '--fep' ,
596+ desc = 'Fill empty planes in x- or y-directions' )
595597 initrand = traits .Bool (
596598 False ,
597599 argstr = '--initrand' ,
@@ -600,6 +602,7 @@ class EddyInputSpec(FSLCommandInputSpec):
600602 interp = traits .Enum (
601603 'spline' ,
602604 'trilinear' ,
605+ usedefault = True ,
603606 argstr = '--interp=%s' ,
604607 desc = 'Interpolation model for estimation step' )
605608 nvoxhp = traits .Int (
@@ -626,6 +629,8 @@ class EddyInputSpec(FSLCommandInputSpec):
626629 desc = "Do NOT perform a post-eddy alignment of "
627630 "shells" )
628631 fwhm = traits .Float (
632+ default_value = 0.0 ,
633+ usedefault = True ,
629634 desc = ('FWHM for conditioning filter when estimating '
630635 'the parameters' ),
631636 argstr = '--fwhm=%s' )
@@ -634,6 +639,7 @@ class EddyInputSpec(FSLCommandInputSpec):
634639 method = traits .Enum (
635640 'jac' ,
636641 'lsr' ,
642+ usedefault = True ,
637643 argstr = '--resamp=%s' ,
638644 desc = ('Final resampling method (jacobian/least '
639645 'squares)' ))
@@ -687,35 +693,36 @@ class EddyInputSpec(FSLCommandInputSpec):
687693 mporder = traits .Int (
688694 argstr = '--mporder=%s' ,
689695 desc = 'Order of slice-to-vol movement model' ,
690- requires = ['slspec' ],
691696 min_ver = '5.0.11' )
692697 s2v_niter = traits .Int (
693698 argstr = '--s2v_niter=%s' ,
694699 desc = 'Number of iterations for slice-to-vol' ,
695- requires = ['slspec ' ],
700+ requires = ['mporder ' ],
696701 min_ver = '5.0.11' )
697702 s2v_lambda = traits .Int (
698703 agstr = '--s2v_lambda' ,
699704 desc = 'Regularisation weight for slice-to-vol movement (reasonable range 1-10)' ,
700- requires = ['slspec ' ],
705+ requires = ['mporder ' ],
701706 min_ver = '5.0.11' )
702707 s2v_interp = traits .Enum (
703708 'trilinear' ,
704709 'spline' ,
705710 argstr = '--s2v_interp=%s' ,
706711 desc = 'Slice-to-vol interpolation model for estimation step' ,
707- requires = ['slspec ' ],
712+ requires = ['mporder ' ],
708713 min_ver = '5.0.11' )
709714 slspec = traits .File (
710715 exists = True ,
711716 argstr = '--slspec=%s' ,
712717 desc = 'Name of text file completely specifying slice/group acquisition' ,
718+ requires = ['mporder' ],
713719 xor = ['json' ],
714720 min_ver = '5.0.11' )
715721 json = traits .File (
716722 exists = True ,
717723 argstr = '--json=%s' ,
718724 desc = 'Name of .json text file with information about slice timing' ,
725+ requires = ['mporder' ],
719726 xor = ['slspec' ],
720727 min_ver = '6.0.1' )
721728
@@ -845,14 +852,18 @@ class Eddy(FSLCommand):
845852 >>> eddy.inputs.in_bval = 'bvals.scheme'
846853 >>> eddy.inputs.use_cuda = True
847854 >>> eddy.cmdline # doctest: +ELLIPSIS
848- 'eddy_cuda --ff=10.0 --fwhm=0 --acqp=epi_acqp.txt --bvals=bvals.scheme \
849- --bvecs=bvecs.scheme --imain=epi.nii --index=epi_index.txt \
850- --mask=epi_mask.nii --niter=5 --nvoxhp=1000 --out=.../eddy_corrected'
855+ 'eddy_cuda --flm=quadratic --ff=10.0 --fwhm=0.0 \
856+ --acqp=epi_acqp.txt --bvals=bvals.scheme --bvecs=bvecs.scheme \
857+ --imain=epi.nii --index=epi_index.txt --mask=epi_mask.nii \
858+ --interp=spline --resamp=jac --niter=5 --nvoxhp=1000 \
859+ --out=.../eddy_corrected --slm=none'
851860 >>> eddy.inputs.use_cuda = False
852861 >>> eddy.cmdline # doctest: +ELLIPSIS
853- 'eddy_openmp --ff=10.0 --fwhm=0 --acqp=epi_acqp.txt --bvals=bvals.scheme \
854- --bvecs=bvecs.scheme --imain=epi.nii --index=epi_index.txt \
855- --mask=epi_mask.nii --niter=5 --nvoxhp=1000 --out=.../eddy_corrected'
862+ 'eddy_openmp --flm=quadratic --ff=10.0 --fwhm=0.0 \
863+ --acqp=epi_acqp.txt --bvals=bvals.scheme --bvecs=bvecs.scheme \
864+ --imain=epi.nii --index=epi_index.txt --mask=epi_mask.nii \
865+ --interp=spline --resamp=jac --niter=5 --nvoxhp=1000 \
866+ --out=.../eddy_corrected --slm=none'
856867 >>> res = eddy.run() # doctest: +SKIP
857868
858869 """
0 commit comments