@@ -1444,13 +1444,22 @@ class RandomiseInputSpec(FSLCommandInputSpec):
1444
1444
class RandomiseOutputSpec (TraitedSpec ):
1445
1445
tstat_files = traits .List (
1446
1446
File (exists = True ),
1447
- desc = 'path/name of tstat image corresponding to the first t contrast' )
1448
- p_files = traits .List (
1447
+ desc = 't contrast raw statistic' )
1448
+ fstat_files = traits .List (
1449
+ File (exists = True ),
1450
+ desc = 'f contrast raw statistic' )
1451
+ t_p_files = traits .List (
1449
1452
File (exists = True ),
1450
- desc = 'p uncorrected files' )
1451
- corrected_p_files = traits .List (
1453
+ desc = 'f contrast uncorrected p values files' )
1454
+ f_p_files = traits .List (
1455
+ File (exists = True ),
1456
+ desc = 'f contrast uncorrected p values files' )
1457
+ t_corrected_p_files = traits .List (
1452
1458
File (exists = True ),
1453
- desc = 'p FWE (Family-wise error) corrected files' )
1459
+ desc = 't contrast FWE (Family-wise error) corrected p values files' )
1460
+ f_corrected_p_files = traits .List (
1461
+ File (exists = True ),
1462
+ desc = 'f contrast FWE (Family-wise error) corrected p values files' )
1454
1463
1455
1464
class Randomise (FSLCommand ):
1456
1465
"""XXX UNSTABLE DO NOT USE
@@ -1480,17 +1489,28 @@ def _list_outputs(self):
1480
1489
import glob
1481
1490
outputs ['tstat_files' ] = glob .glob ('%s/%s_tstat*.nii' % (
1482
1491
os .getcwd (),self .inputs .base_name ))
1492
+ outputs ['fstat_files' ] = glob .glob ('%s/%s_fstat*.nii' % (
1493
+ os .getcwd (),self .inputs .base_name ))
1483
1494
prefix = False
1484
1495
if self .inputs .tfce or self .inputs .tfce2D :
1485
1496
prefix = 'tfce'
1486
1497
elif self .inputs .vox_p_values :
1487
1498
prefix = 'vox'
1499
+ elif self .inputs .c_thresh or self .inputs .f_c_thresh :
1500
+ prefix = 'clustere'
1501
+ elif self .inputs .cm_thresh or self .inputs .f_cm_thresh :
1502
+ prefix = 'clusterm'
1488
1503
if prefix :
1489
- outputs ['p_files' ] = glob .glob ('%s/%s_%s_p_tstat*.nii' % (
1504
+ outputs ['t_p_files' ] = glob .glob ('%s/%s_%s_p_tstat*.nii' % (
1505
+ os .getcwd (),self .inputs .base_name ,prefix ))
1506
+ outputs ['t_corrected_p_files' ] = glob .glob (
1507
+ '%s/%s_%s_corrp_fstat*.nii' % (
1508
+ os .getcwd (),self .inputs .base_name ,prefix ))
1509
+
1510
+ outputs ['f_p_files' ] = glob .glob ('%s/%s_%s_p_tstat*.nii' % (
1490
1511
os .getcwd (),self .inputs .base_name ,prefix ))
1491
- outputs ['corrected_p_files ' ] = glob .glob (
1492
- '%s/%s_%s_corrp_tstat *.nii' % (
1512
+ outputs ['f_corrected_p_files ' ] = glob .glob (
1513
+ '%s/%s_%s_corrp_fstat *.nii' % (
1493
1514
os .getcwd (),self .inputs .base_name ,prefix ))
1494
1515
1495
- #self._gen_fname(self.inputs.base_name, suffix='_tstat1')
1496
1516
return outputs
0 commit comments