|
30 | 30 | BaseInterfaceInputSpec)
|
31 | 31 | from .base import FSLCommand, FSLCommandInputSpec, Info
|
32 | 32 |
|
33 |
| - |
34 | 33 | class Level1DesignInputSpec(BaseInterfaceInputSpec):
|
35 | 34 | interscan_interval = traits.Float(mandatory=True,
|
36 | 35 | desc='Interscan interval (in secs)')
|
@@ -694,18 +693,15 @@ class FILMGLS(FSLCommand):
|
694 | 693 | """
|
695 | 694 |
|
696 | 695 | _cmd = 'film_gls'
|
697 |
| - |
| 696 | + input_spec = FILMGLSInputSpec |
| 697 | + output_spec = FILMGLSOutputSpec |
698 | 698 | if Info.version() and LooseVersion(Info.version()) > LooseVersion('5.0.6'):
|
699 | 699 | input_spec = FILMGLSInputSpec507
|
| 700 | + output_spec = FILMGLSOutputSpec507 |
700 | 701 | elif (Info.version() and
|
701 | 702 | LooseVersion(Info.version()) > LooseVersion('5.0.4')):
|
702 | 703 | input_spec = FILMGLSInputSpec505
|
703 |
| - else: |
704 |
| - input_spec = FILMGLSInputSpec |
705 |
| - if Info.version() and LooseVersion(Info.version()) > LooseVersion('5.0.6'): |
706 |
| - output_spec = FILMGLSOutputSpec507 |
707 |
| - else: |
708 |
| - output_spec = FILMGLSOutputSpec |
| 704 | + |
709 | 705 |
|
710 | 706 | def _get_pe_files(self, cwd):
|
711 | 707 | files = None
|
@@ -1075,13 +1071,16 @@ class ContrastMgr(FSLCommand):
|
1075 | 1071 | """Use FSL contrast_mgr command to evaluate contrasts
|
1076 | 1072 |
|
1077 | 1073 | In interface mode this file assumes that all the required inputs are in the
|
1078 |
| - same location. |
| 1074 | + same location. This has deprecated for FSL versions 5.0.7+ as the necessary |
| 1075 | + corrections file is no longer generated by FILMGLS. |
1079 | 1076 | """
|
1080 |
| - |
| 1077 | + if Info.version() and LooseVersion(Info.version()) >= LooseVersion("5.0.7"): |
| 1078 | + DeprecationWarning("ContrastMgr is deprecated in FSL 5.0.7+") |
1081 | 1079 | _cmd = 'contrast_mgr'
|
1082 | 1080 | input_spec = ContrastMgrInputSpec
|
1083 | 1081 | output_spec = ContrastMgrOutputSpec
|
1084 | 1082 |
|
| 1083 | + |
1085 | 1084 | def _run_interface(self, runtime):
|
1086 | 1085 | # The returncode is meaningless in ContrastMgr. So check the output
|
1087 | 1086 | # in stderr and if it's set, then update the returncode
|
|
0 commit comments