Skip to content

Commit 482d815

Browse files
committed
fix: strings too long
1 parent 32fc5f1 commit 482d815

File tree

2 files changed

+39
-17
lines changed

2 files changed

+39
-17
lines changed

nipype/interfaces/afni/preprocess.py

+11-8
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@ class AlignEpiAnatPy(AFNIPythonCommand):
180180
>>> al_ea.inputs.tshift = 'off'
181181
>>> al_ea.inputs.save_skullstrip = True
182182
>>> al_ea.cmdline # doctest: +ELLIPSIS
183-
'python2 ...align_epi_anat.py -anat structural.nii -epi_base 0 -epi_strip 3dAutomask -epi functional.nii -save_skullstrip -suffix _al -tshift off -volreg off'
183+
'python2 ...align_epi_anat.py -anat structural.nii -epi_base 0 -epi_strip 3dAutomask -epi \
184+
functional.nii -save_skullstrip -suffix _al -tshift off -volreg off'
184185
>>> res = allineate.run() # doctest: +SKIP
185186
186187
See Also
@@ -3285,7 +3286,8 @@ class Volreg(AFNICommand):
32853286
>>> volreg.inputs.zpad = 4
32863287
>>> volreg.inputs.outputtype = 'NIFTI'
32873288
>>> volreg.cmdline # doctest: +ELLIPSIS
3288-
'3dvolreg -Fourier -twopass -1Dfile functional.1D -1Dmatrix_save functional.aff12.1D -prefix functional_volreg.nii -zpad 4 -maxdisp1D functional_md.1D functional.nii'
3289+
'3dvolreg -Fourier -twopass -1Dfile functional.1D -1Dmatrix_save functional.aff12.1D -prefix \
3290+
functional_volreg.nii -zpad 4 -maxdisp1D functional_md.1D functional.nii'
32893291
>>> res = volreg.run() # doctest: +SKIP
32903292
32913293
>>> from nipype.interfaces import afni
@@ -3299,7 +3301,8 @@ class Volreg(AFNICommand):
32993301
>>> volreg.inputs.oned_file = 'dfile.r1.1D'
33003302
>>> volreg.inputs.oned_matrix_save = 'mat.r1.tshift+orig.1D'
33013303
>>> volreg.cmdline
3302-
'3dvolreg -cubic -1Dfile dfile.r1.1D -1Dmatrix_save mat.r1.tshift+orig.1D -prefix rm.epi.volreg.r1 -verbose -base functional.nii -zpad 1 -maxdisp1D functional_md.1D functional.nii'
3304+
'3dvolreg -cubic -1Dfile dfile.r1.1D -1Dmatrix_save mat.r1.tshift+orig.1D -prefix \
3305+
rm.epi.volreg.r1 -verbose -base functional.nii -zpad 1 -maxdisp1D functional_md.1D functional.nii'
33033306
>>> res = volreg.run() # doctest: +SKIP
33043307
33053308
"""
@@ -3406,8 +3409,8 @@ class Warp(AFNICommand):
34063409
input_spec = WarpInputSpec
34073410
output_spec = WarpOutputSpec
34083411

3409-
def _run_interface(self, runtime):
3410-
runtime = super(Warp, self)._run_interface(runtime)
3412+
def _run_interface(self, runtime, correct_return_codes=(0,)):
3413+
runtime = super(Warp, self)._run_interface(runtime, correct_return_codes)
34113414

34123415
if self.inputs.save_warp:
34133416
import numpy as np
@@ -4168,10 +4171,10 @@ class Qwarp(AFNICommand):
41684171
input_spec = QwarpInputSpec
41694172
output_spec = QwarpOutputSpec
41704173

4171-
def _format_arg(self, name, spec, value):
4174+
def _format_arg(self, name, trait_spec, value):
41724175
if name == "allineate_opts":
4173-
return spec.argstr % ("'" + value + "'")
4174-
return super(Qwarp, self)._format_arg(name, spec, value)
4176+
return trait_spec.argstr % ("'" + value + "'")
4177+
return super(Qwarp, self)._format_arg(name, trait_spec, value)
41754178

41764179
def _list_outputs(self):
41774180
outputs = self.output_spec().get()

nipype/interfaces/ants/segmentation.py

+28-9
Original file line numberDiff line numberDiff line change
@@ -1193,15 +1193,17 @@ class JointFusion(ANTSCommand):
11931193
... 'segmentation1.nii.gz']
11941194
>>> at.inputs.target_image = 'T1.nii'
11951195
>>> at.cmdline
1196-
'jointfusion 3 1 -m Joint[0.1,2] -tg T1.nii -g im1.nii -g im2.nii -g im3.nii -l segmentation0.nii.gz -l segmentation1.nii.gz -l segmentation1.nii.gz fusion_labelimage_output.nii'
1196+
'jointfusion 3 1 -m Joint[0.1,2] -tg T1.nii -g im1.nii -g im2.nii -g im3.nii -l segmentation0.nii.gz \
1197+
-l segmentation1.nii.gz -l segmentation1.nii.gz fusion_labelimage_output.nii'
11971198
11981199
>>> at.inputs.method = 'Joint'
11991200
>>> at.inputs.alpha = 0.5
12001201
>>> at.inputs.beta = 1
12011202
>>> at.inputs.patch_radius = [3,2,1]
12021203
>>> at.inputs.search_radius = [1,2,3]
12031204
>>> at.cmdline
1204-
'jointfusion 3 1 -m Joint[0.5,1] -rp 3x2x1 -rs 1x2x3 -tg T1.nii -g im1.nii -g im2.nii -g im3.nii -l segmentation0.nii.gz -l segmentation1.nii.gz -l segmentation1.nii.gz fusion_labelimage_output.nii'
1205+
'jointfusion 3 1 -m Joint[0.5,1] -rp 3x2x1 -rs 1x2x3 -tg T1.nii -g im1.nii -g im2.nii -g im3.nii \
1206+
-l segmentation0.nii.gz -l segmentation1.nii.gz -l segmentation1.nii.gz fusion_labelimage_output.nii'
12051207
12061208
"""
12071209

@@ -1512,40 +1514,52 @@ class AntsJointFusion(ANTSCommand):
15121514
>>> antsjointfusion.inputs.atlas_segmentation_image = ['segmentation0.nii.gz']
15131515
>>> antsjointfusion.inputs.target_image = ['im1.nii']
15141516
>>> antsjointfusion.cmdline
1515-
"antsJointFusion -a 0.1 -g ['rc1s1.nii', 'rc1s2.nii'] -l segmentation0.nii.gz -b 2.0 -o ants_fusion_label_output.nii -s 3x3x3 -t ['im1.nii']"
1517+
"antsJointFusion -a 0.1 -g ['rc1s1.nii', 'rc1s2.nii'] -l segmentation0.nii.gz \
1518+
-b 2.0 -o ants_fusion_label_output.nii -s 3x3x3 -t ['im1.nii']"
15161519
15171520
>>> antsjointfusion.inputs.target_image = [ ['im1.nii', 'im2.nii'] ]
15181521
>>> antsjointfusion.cmdline
1519-
"antsJointFusion -a 0.1 -g ['rc1s1.nii', 'rc1s2.nii'] -l segmentation0.nii.gz -b 2.0 -o ants_fusion_label_output.nii -s 3x3x3 -t ['im1.nii', 'im2.nii']"
1522+
"antsJointFusion -a 0.1 -g ['rc1s1.nii', 'rc1s2.nii'] -l segmentation0.nii.gz \
1523+
-b 2.0 -o ants_fusion_label_output.nii -s 3x3x3 -t ['im1.nii', 'im2.nii']"
15201524
15211525
>>> antsjointfusion.inputs.atlas_image = [ ['rc1s1.nii','rc1s2.nii'],
15221526
... ['rc2s1.nii','rc2s2.nii'] ]
15231527
>>> antsjointfusion.inputs.atlas_segmentation_image = ['segmentation0.nii.gz',
15241528
... 'segmentation1.nii.gz']
15251529
>>> antsjointfusion.cmdline
1526-
"antsJointFusion -a 0.1 -g ['rc1s1.nii', 'rc1s2.nii'] -g ['rc2s1.nii', 'rc2s2.nii'] -l segmentation0.nii.gz -l segmentation1.nii.gz -b 2.0 -o ants_fusion_label_output.nii -s 3x3x3 -t ['im1.nii', 'im2.nii']"
1530+
"antsJointFusion -a 0.1 -g ['rc1s1.nii', 'rc1s2.nii'] -g ['rc2s1.nii', 'rc2s2.nii'] \
1531+
-l segmentation0.nii.gz -l segmentation1.nii.gz -b 2.0 -o ants_fusion_label_output.nii \
1532+
-s 3x3x3 -t ['im1.nii', 'im2.nii']"
15271533
15281534
>>> antsjointfusion.inputs.dimension = 3
15291535
>>> antsjointfusion.inputs.alpha = 0.5
15301536
>>> antsjointfusion.inputs.beta = 1.0
15311537
>>> antsjointfusion.inputs.patch_radius = [3,2,1]
15321538
>>> antsjointfusion.inputs.search_radius = [3]
15331539
>>> antsjointfusion.cmdline
1534-
"antsJointFusion -a 0.5 -g ['rc1s1.nii', 'rc1s2.nii'] -g ['rc2s1.nii', 'rc2s2.nii'] -l segmentation0.nii.gz -l segmentation1.nii.gz -b 1.0 -d 3 -o ants_fusion_label_output.nii -p 3x2x1 -s 3 -t ['im1.nii', 'im2.nii']"
1540+
"antsJointFusion -a 0.5 -g ['rc1s1.nii', 'rc1s2.nii'] -g ['rc2s1.nii', 'rc2s2.nii'] \
1541+
-l segmentation0.nii.gz -l segmentation1.nii.gz -b 1.0 -d 3 -o ants_fusion_label_output.nii \
1542+
-p 3x2x1 -s 3 -t ['im1.nii', 'im2.nii']"
15351543
15361544
>>> antsjointfusion.inputs.search_radius = ['mask.nii']
15371545
>>> antsjointfusion.inputs.verbose = True
15381546
>>> antsjointfusion.inputs.exclusion_image = ['roi01.nii', 'roi02.nii']
15391547
>>> antsjointfusion.inputs.exclusion_image_label = ['1','2']
15401548
>>> antsjointfusion.cmdline
1541-
"antsJointFusion -a 0.5 -g ['rc1s1.nii', 'rc1s2.nii'] -g ['rc2s1.nii', 'rc2s2.nii'] -l segmentation0.nii.gz -l segmentation1.nii.gz -b 1.0 -d 3 -e 1[roi01.nii] -e 2[roi02.nii] -o ants_fusion_label_output.nii -p 3x2x1 -s mask.nii -t ['im1.nii', 'im2.nii'] -v"
1549+
"antsJointFusion -a 0.5 -g ['rc1s1.nii', 'rc1s2.nii'] -g ['rc2s1.nii', 'rc2s2.nii'] \
1550+
-l segmentation0.nii.gz -l segmentation1.nii.gz -b 1.0 -d 3 -e 1[roi01.nii] -e 2[roi02.nii] \
1551+
-o ants_fusion_label_output.nii -p 3x2x1 -s mask.nii -t ['im1.nii', 'im2.nii'] -v"
15421552
15431553
>>> antsjointfusion.inputs.out_label_fusion = 'ants_fusion_label_output.nii'
15441554
>>> antsjointfusion.inputs.out_intensity_fusion_name_format = 'ants_joint_fusion_intensity_%d.nii.gz'
15451555
>>> antsjointfusion.inputs.out_label_post_prob_name_format = 'ants_joint_fusion_posterior_%d.nii.gz'
15461556
>>> antsjointfusion.inputs.out_atlas_voting_weight_name_format = 'ants_joint_fusion_voting_weight_%d.nii.gz'
15471557
>>> antsjointfusion.cmdline
1548-
"antsJointFusion -a 0.5 -g ['rc1s1.nii', 'rc1s2.nii'] -g ['rc2s1.nii', 'rc2s2.nii'] -l segmentation0.nii.gz -l segmentation1.nii.gz -b 1.0 -d 3 -e 1[roi01.nii] -e 2[roi02.nii] -o [ants_fusion_label_output.nii, ants_joint_fusion_intensity_%d.nii.gz, ants_joint_fusion_posterior_%d.nii.gz, ants_joint_fusion_voting_weight_%d.nii.gz] -p 3x2x1 -s mask.nii -t ['im1.nii', 'im2.nii'] -v"
1558+
"antsJointFusion -a 0.5 -g ['rc1s1.nii', 'rc1s2.nii'] -g ['rc2s1.nii', 'rc2s2.nii'] \
1559+
-l segmentation0.nii.gz -l segmentation1.nii.gz -b 1.0 -d 3 -e 1[roi01.nii] -e 2[roi02.nii] \
1560+
-o [ants_fusion_label_output.nii, ants_joint_fusion_intensity_%d.nii.gz, \
1561+
ants_joint_fusion_posterior_%d.nii.gz, ants_joint_fusion_voting_weight_%d.nii.gz] \
1562+
-p 3x2x1 -s mask.nii -t ['im1.nii', 'im2.nii'] -v"
15491563
15501564
"""
15511565

@@ -1798,7 +1812,12 @@ class KellyKapowski(ANTSCommand):
17981812
>>> kk.inputs.convergence = "[45,0.0,10]"
17991813
>>> kk.inputs.thickness_prior_estimate = 10
18001814
>>> kk.cmdline
1801-
'KellyKapowski --convergence "[45,0.0,10]" --output "[segmentation0_cortical_thickness.nii.gz,segmentation0_warped_white_matter.nii.gz]" --image-dimensionality 3 --gradient-step 0.025000 --maximum-number-of-invert-displacement-field-iterations 20 --number-of-integration-points 10 --segmentation-image "[segmentation0.nii.gz,2,3]" --smoothing-variance 1.000000 --smoothing-velocity-field-parameter 1.500000 --thickness-prior-estimate 10.000000'
1815+
'KellyKapowski --convergence "[45,0.0,10]" \
1816+
--output "[segmentation0_cortical_thickness.nii.gz,segmentation0_warped_white_matter.nii.gz]" \
1817+
--image-dimensionality 3 --gradient-step 0.025000 \
1818+
--maximum-number-of-invert-displacement-field-iterations 20 --number-of-integration-points 10 \
1819+
--segmentation-image "[segmentation0.nii.gz,2,3]" --smoothing-variance 1.000000 \
1820+
--smoothing-velocity-field-parameter 1.500000 --thickness-prior-estimate 10.000000'
18021821
18031822
"""
18041823

0 commit comments

Comments
 (0)