Skip to content

Commit bb9f5b4

Browse files
committed
Extended MRtrix3 interface
1 parent 1b05497 commit bb9f5b4

29 files changed

+1035
-36
lines changed

.zenodo.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,10 @@
538538
"affiliation": "MIT",
539539
"name": "Kaczmarzyk, Jakub",
540540
"orcid": "0000-0002-5544-7577"
541+
},
542+
{
543+
"affiliation": "University College London"
544+
"name": "Mancini, Matteo"
541545
}
542546
],
543547
"keywords": [

doc/users/config_file.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ Execution
7474

7575
*display_variable*
7676
Override the ``$DISPLAY`` environment variable for interfaces that require
77-
an X server. This option is useful if there is a running X server, but
78-
``$DISPLAY`` was not defined in nipype's environment. For example, if an X
77+
an X server. This option is useful if there is a running X server, but
78+
``$DISPLAY`` was not defined in nipype's environment. For example, if an X
7979
server is listening on the default port of 6000, set ``display_variable = :0``
80-
to enable nipype interfaces to use it. It may also point to displays provided
81-
by VNC, `xnest <http://www.x.org/archive/X11R7.5/doc/man/man1/Xnest.1.html>`_
80+
to enable nipype interfaces to use it. It may also point to displays provided
81+
by VNC, `xnest <http://www.x.org/archive/X11R7.5/doc/man/man1/Xnest.1.html>`_
8282
or `Xvfb <http://www.x.org/archive/X11R6.8.1/doc/Xvfb.1.html>`_.
8383
If neither ``display_variable`` nor the ``$DISPLAY`` environment variable are
8484
set, nipype will try to configure a new virtual server using Xvfb.

doc/users/plugins.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ Optional arguments::
8282
exceed the total amount of resources available (memory and threads), when
8383
``False`` (default), only a warning will be issued.
8484

85-
maxtasksperchild : number of nodes to run on each process before refreshing
85+
maxtasksperchild : number of nodes to run on each process before refreshing
8686
the worker (default: 10).
87-
87+
8888

8989
To distribute processing on a multicore machine, simply call::
9090

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
2+
from __future__ import unicode_literals
3+
from ..confounds import CompCor
4+
5+
6+
def test_CompCor_inputs():
7+
input_map = dict(components_file=dict(usedefault=True,
8+
),
9+
header_prefix=dict(),
10+
high_pass_cutoff=dict(usedefault=True,
11+
),
12+
ignore_exception=dict(nohash=True,
13+
usedefault=True,
14+
),
15+
ignore_initial_volumes=dict(usedefault=True,
16+
),
17+
mask_files=dict(),
18+
mask_index=dict(requires=['mask_files'],
19+
xor=['merge_method'],
20+
),
21+
merge_method=dict(requires=['mask_files'],
22+
xor=['mask_index'],
23+
),
24+
num_components=dict(usedefault=True,
25+
),
26+
pre_filter=dict(usedefault=True,
27+
),
28+
realigned_file=dict(mandatory=True,
29+
),
30+
regress_poly_degree=dict(usedefault=True,
31+
),
32+
repetition_time=dict(),
33+
save_pre_filter=dict(),
34+
use_regress_poly=dict(deprecated='0.15.0',
35+
new_name='pre_filter',
36+
),
37+
)
38+
inputs = CompCor.input_spec()
39+
40+
for key, metadata in list(input_map.items()):
41+
for metakey, value in list(metadata.items()):
42+
assert getattr(inputs.traits()[key], metakey) == value
43+
44+
45+
def test_CompCor_outputs():
46+
output_map = dict(components_file=dict(),
47+
pre_filter_file=dict(),
48+
)
49+
outputs = CompCor.output_spec()
50+
51+
for key, metadata in list(output_map.items()):
52+
for metakey, value in list(metadata.items()):
53+
assert getattr(outputs.traits()[key], metakey) == value
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
2+
from __future__ import unicode_literals
3+
from ..metrics import ErrorMap
4+
5+
6+
def test_ErrorMap_inputs():
7+
input_map = dict(ignore_exception=dict(nohash=True,
8+
usedefault=True,
9+
),
10+
in_ref=dict(mandatory=True,
11+
),
12+
in_tst=dict(mandatory=True,
13+
),
14+
mask=dict(),
15+
metric=dict(mandatory=True,
16+
usedefault=True,
17+
),
18+
out_map=dict(),
19+
)
20+
inputs = ErrorMap.input_spec()
21+
22+
for key, metadata in list(input_map.items()):
23+
for metakey, value in list(metadata.items()):
24+
assert getattr(inputs.traits()[key], metakey) == value
25+
26+
27+
def test_ErrorMap_outputs():
28+
output_map = dict(distance=dict(),
29+
out_map=dict(),
30+
)
31+
outputs = ErrorMap.output_spec()
32+
33+
for key, metadata in list(output_map.items()):
34+
for metakey, value in list(metadata.items()):
35+
assert getattr(outputs.traits()[key], metakey) == value
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
2+
from __future__ import unicode_literals
3+
from ..misc import Overlap
4+
5+
6+
def test_Overlap_inputs():
7+
input_map = dict(bg_overlap=dict(mandatory=True,
8+
usedefault=True,
9+
),
10+
ignore_exception=dict(nohash=True,
11+
usedefault=True,
12+
),
13+
mask_volume=dict(),
14+
out_file=dict(usedefault=True,
15+
),
16+
vol_units=dict(mandatory=True,
17+
usedefault=True,
18+
),
19+
volume1=dict(mandatory=True,
20+
),
21+
volume2=dict(mandatory=True,
22+
),
23+
weighting=dict(usedefault=True,
24+
),
25+
)
26+
inputs = Overlap.input_spec()
27+
28+
for key, metadata in list(input_map.items()):
29+
for metakey, value in list(metadata.items()):
30+
assert getattr(inputs.traits()[key], metakey) == value
31+
32+
33+
def test_Overlap_outputs():
34+
output_map = dict(dice=dict(),
35+
diff_file=dict(),
36+
jaccard=dict(),
37+
labels=dict(),
38+
roi_di=dict(),
39+
roi_ji=dict(),
40+
roi_voldiff=dict(),
41+
volume_difference=dict(),
42+
)
43+
outputs = Overlap.output_spec()
44+
45+
for key, metadata in list(output_map.items()):
46+
for metakey, value in list(metadata.items()):
47+
assert getattr(outputs.traits()[key], metakey) == value
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
2+
from __future__ import unicode_literals
3+
from ..misc import TSNR
4+
5+
6+
def test_TSNR_inputs():
7+
input_map = dict(detrended_file=dict(hash_files=False,
8+
usedefault=True,
9+
),
10+
ignore_exception=dict(nohash=True,
11+
usedefault=True,
12+
),
13+
in_file=dict(mandatory=True,
14+
),
15+
mean_file=dict(hash_files=False,
16+
usedefault=True,
17+
),
18+
regress_poly=dict(),
19+
stddev_file=dict(hash_files=False,
20+
usedefault=True,
21+
),
22+
tsnr_file=dict(hash_files=False,
23+
usedefault=True,
24+
),
25+
)
26+
inputs = TSNR.input_spec()
27+
28+
for key, metadata in list(input_map.items()):
29+
for metakey, value in list(metadata.items()):
30+
assert getattr(inputs.traits()[key], metakey) == value
31+
32+
33+
def test_TSNR_outputs():
34+
output_map = dict(detrended_file=dict(),
35+
mean_file=dict(),
36+
stddev_file=dict(),
37+
tsnr_file=dict(),
38+
)
39+
outputs = TSNR.output_spec()
40+
41+
for key, metadata in list(output_map.items()):
42+
for metakey, value in list(metadata.items()):
43+
assert getattr(outputs.traits()[key], metakey) == value

nipype/algorithms/tests/test_mesh_ops.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
@pytest.mark.skipif(VTKInfo.no_tvtk(), reason="tvtk is not installed")
1717
def test_ident_distances(tmpdir):
18-
tmpdir.chdir()
18+
tmpdir.chdir()
1919

2020
in_surf = example_data('surf01.vtk')
2121
dist_ident = m.ComputeMeshWarp()

nipype/interfaces/afni/preprocess.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3490,7 +3490,7 @@ class Qwarp(AFNICommand):
34903490
>>> qwarp3.inputs.base_file = 'mni.nii'
34913491
>>> qwarp3.inputs.allineate = True
34923492
>>> qwarp3.inputs.allineate_opts = '-cose lpa -verb'
3493-
>>> qwarp3.cmdline
3493+
>>> qwarp3.cmdline # doctest: +ALLOW_UNICODE
34943494
"3dQwarp -allineate -allineate_opts '-cose lpa -verb' -base mni.nii -source structural.nii -prefix structural_QW"
34953495
>>> res3 = qwarp3.run() # doctest: +SKIP """
34963496
_cmd = '3dQwarp'
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
2+
from __future__ import unicode_literals
3+
from ..utils import TCatSubBrick
4+
5+
6+
def test_TCatSubBrick_inputs():
7+
input_map = dict(args=dict(argstr='%s',
8+
),
9+
environ=dict(nohash=True,
10+
usedefault=True,
11+
),
12+
ignore_exception=dict(nohash=True,
13+
usedefault=True,
14+
),
15+
in_files=dict(argstr='%s%s ...',
16+
copyfile=False,
17+
mandatory=True,
18+
position=-1,
19+
),
20+
num_threads=dict(nohash=True,
21+
usedefault=True,
22+
),
23+
out_file=dict(argstr='-prefix %s',
24+
genfile=True,
25+
),
26+
outputtype=dict(),
27+
rlt=dict(argstr='-rlt%s',
28+
position=1,
29+
),
30+
terminal_output=dict(deprecated='1.0.0',
31+
nohash=True,
32+
),
33+
)
34+
inputs = TCatSubBrick.input_spec()
35+
36+
for key, metadata in list(input_map.items()):
37+
for metakey, value in list(metadata.items()):
38+
assert getattr(inputs.traits()[key], metakey) == value
39+
40+
41+
def test_TCatSubBrick_outputs():
42+
output_map = dict(out_file=dict(),
43+
)
44+
outputs = TCatSubBrick.output_spec()
45+
46+
for key, metadata in list(output_map.items()):
47+
for metakey, value in list(metadata.items()):
48+
assert getattr(outputs.traits()[key], metakey) == value

0 commit comments

Comments
 (0)