|
13 | 13 | from ...utils.filemanip import (load_json, save_json, split_filename,
|
14 | 14 | fname_presuffix)
|
15 | 15 | from ..base import (CommandLineInputSpec, CommandLine, TraitedSpec, traits,
|
16 |
| - isdefined, File, InputMultiPath, Undefined, Str) |
| 16 | + isdefined, File, InputMultiPath, Undefined, Str, |
| 17 | + InputMultiObject) |
17 | 18 |
|
18 | 19 | from .base import (AFNICommandBase, AFNICommand, AFNICommandInputSpec,
|
19 | 20 | AFNICommandOutputSpec, AFNIPythonCommandInputSpec,
|
@@ -2492,14 +2493,15 @@ class TProjectInputSpec(AFNICommandInputSpec):
|
2492 | 2493 | even if -ort contains constant terms, as all means are
|
2493 | 2494 | removed.""",
|
2494 | 2495 | argstr="-polort %d")
|
2495 |
| - dsort = File( |
| 2496 | + dsort = InputMultiObject( |
| 2497 | + File( |
| 2498 | + exists=True, |
| 2499 | + copyfile=False), |
| 2500 | + argstr="%s", |
2496 | 2501 | desc="""Remove the 3D+time time series in dataset fset.
|
2497 | 2502 | ++ That is, 'fset' contains a different nuisance time
|
2498 |
| - series for each voxel (e.g., from AnatICOR). |
2499 |
| - ++ Multiple -dsort options are allowed.""", |
2500 |
| - argstr='-dsort %s', |
2501 |
| - exists=True, |
2502 |
| - copyfile=False) |
| 2503 | + series for each voxel (e.g., from AnatICOR). |
| 2504 | + ++ Multiple -dsort options are allowed.""") |
2503 | 2505 | bandpass = traits.Tuple(
|
2504 | 2506 | traits.Float, traits.Float,
|
2505 | 2507 | desc="""Remove all frequencies EXCEPT those in the range""",
|
@@ -2567,6 +2569,11 @@ class TProject(AFNICommand):
|
2567 | 2569 | _cmd = '3dTproject'
|
2568 | 2570 | input_spec = TProjectInputSpec
|
2569 | 2571 | output_spec = AFNICommandOutputSpec
|
| 2572 | + |
| 2573 | + def _format_arg(self, name, spec, value): |
| 2574 | + if name == 'dsort': |
| 2575 | + return ' '.join(["-dsort %s" % dsort_file for dsort_file in value]) |
| 2576 | + return super(TProject, self)._format_arg(name, spec, value) |
2570 | 2577 |
|
2571 | 2578 | class TShiftInputSpec(AFNICommandInputSpec):
|
2572 | 2579 | in_file = File(
|
|
0 commit comments