Skip to content

Commit e943cdc

Browse files
committed
FIX: Cleanup some doctests and input traits
1 parent 09256ef commit e943cdc

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

nipype/interfaces/freesurfer/petsurfer.py

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,11 @@ class GTMSegInputSpec(FSTraitedSpec):
4646
desc="run xcerebralseg on this subject to create apas+head.mgz",
4747
)
4848

49-
gtm_file = File(
49+
out_file = File(
50+
"gtmseg.mgz",
5051
argstr="--o %s",
51-
desc="output volume relative to subject/mri (default is gtmseg.mgz)",
52+
desc="output volume relative to subject/mri",
53+
usedefault=True,
5254
)
5355

5456
usf = traits.Int(argstr="--usf %i", desc="upsampling factor (default is 2)")
@@ -116,7 +118,7 @@ class GTMSegInputSpec(FSTraitedSpec):
116118

117119

118120
class GTMSegOutputSpec(TraitedSpec):
119-
gtm_file = File(exists=True, desc="GTM segmentation")
121+
out_file = File(exists=True, desc="GTM segmentation")
120122

121123

122124
class GTMSeg(FSCommand):
@@ -125,10 +127,9 @@ class GTMSeg(FSCommand):
125127
Examples
126128
--------
127129
>>> gtmseg = GTMSeg()
128-
>>> gtmseg.inputs.out_file = 'gtmseg.nii'
129130
>>> gtmseg.inputs.subject_id = 'subject_id'
130-
>>> gtmseg.cmdline == 'gtmseg --o gtmseg.nii --s subject_id'
131-
131+
>>> gtmseg.cmdline
132+
'gtmseg --o gtmseg.mgz --s subject_id'
132133
"""
133134

134135
_cmd = "gtmseg"
@@ -461,9 +462,11 @@ class GTMPVC(FSCommand):
461462
>>> gtmpvc.inputs.km_hb = ['11 12 50 51']
462463
>>> gtmpvc.inputs.no_rescale = True
463464
>>> gtmpvc.inputs.save_input = True
464-
>>> gtmpvc.cmdline == 'mri_gtmpvc --auto-mask 1.000000 0.100000 --default-seg-merge
465-
--i sub-01_ses-baseline_pet.nii.gz --km-hb 11 12 50 51 --km-ref 8 47 --no-rescale
466-
--o pvc --psf 4.000000 --reg sub-01_ses-baseline_pet_mean_reg.lta --save-input --seg gtmseg.mgz'
465+
>>> gtmpvc.cmdline # doctest: +NORMALIZE_WHITESPACE
466+
'mri_gtmpvc --auto-mask 1.000000 0.100000 --default-seg-merge \
467+
--i sub-01_ses-baseline_pet.nii.gz --km-hb 11 12 50 51 --km-ref 8 47 --no-rescale \
468+
--psf 4.000000 --o pvc --reg sub-01_ses-baseline_pet_mean_reg.lta --save-input \
469+
--seg gtmseg.mgz'
467470
"""
468471

469472
_cmd = "mri_gtmpvc"
@@ -540,7 +543,7 @@ class MRTM(GLMFit):
540543
>>> mrtm = MRTM()
541544
>>> mrtm.inputs.in_file = 'tac.nii'
542545
>>> mrtm.inputs.mrtm1 = [('ref_tac.dat', 'timing.dat')]
543-
>>> mrtm.inputs.glmdir = 'mrtm'
546+
>>> mrtm.inputs.glm_dir = 'mrtm'
544547
>>> mrtm.cmdline
545548
'mri_glmfit --glmdir mrtm --y tac.nii --mrtm1 ref_tac.dat timing.dat'
546549
"""
@@ -582,8 +585,9 @@ class MRTM2(GLMFit):
582585
>>> mrtm2 = MRTM2()
583586
>>> mrtm2.inputs.in_file = 'tac.nii'
584587
>>> mrtm2.inputs.mrtm2 = [('ref_tac.dat', 'timing.dat', 0.07872)]
585-
>>> mrtm2.inputs.glmdir = 'mrtm2'
586-
>>> mrtm2.cmdline == 'mri_glmfit --glmdir mrtm2 --y tac.nii --mrtm2 ref_tac.dat timing.dat 0.07872'
588+
>>> mrtm2.inputs.glm_dir = 'mrtm2'
589+
>>> mrtm2.cmdline
590+
'mri_glmfit --glmdir mrtm2 --y tac.nii --mrtm2 ref_tac.dat timing.dat 0.078720'
587591
"""
588592

589593
_cmd = "mri_glmfit"
@@ -607,7 +611,7 @@ class LoganRefInputSpec(GLMFitInputSpec):
607611
logan = InputMultiPath(
608612
traits.Tuple(File(exists=True), File(exists=True), traits.Float),
609613
mandatory=True,
610-
argstr="--logan %s %s %f...",
614+
argstr="--logan %s %s %g...",
611615
desc="RefTac TimeSec tstar : perform Logan kinetic modeling",
612616
)
613617

@@ -627,8 +631,9 @@ class LoganRef(GLMFit):
627631
>>> logan = LoganRef()
628632
>>> logan.inputs.in_file = 'tac.nii'
629633
>>> logan.inputs.logan = [('ref_tac.dat', 'timing.dat', 2600)]
630-
>>> logan.inputs.glmdir = 'logan'
631-
>>> logan.cmdline == 'mri_glmfit --glmdir logan --y tac.nii --logan ref_tac.dat timing.dat 2600'
634+
>>> logan.inputs.glm_dir = 'logan'
635+
>>> logan.cmdline
636+
'mri_glmfit --glmdir logan --y tac.nii --logan ref_tac.dat timing.dat 2600'
632637
"""
633638

634639
_cmd = "mri_glmfit"

0 commit comments

Comments
 (0)