@@ -536,12 +536,12 @@ def check_behav_list(behav, conds):
536
536
Reorder the copes so that now it combines across runs
537
537
"""
538
538
539
- def sort_copes (copes , varcopes , conds ):
539
+ def sort_copes (copes , varcopes , contrasts ):
540
540
import numpy as np
541
541
if not isinstance (copes , list ):
542
542
copes = [copes ]
543
543
varcopes = [varcopes ]
544
- num_copes = len (conds )
544
+ num_copes = len (contrasts )
545
545
n_runs = len (copes )
546
546
all_copes = np .array (copes ).flatten ()
547
547
all_varcopes = np .array (varcopes ).flatten ()
@@ -550,15 +550,15 @@ def sort_copes(copes, varcopes, conds):
550
550
return outcopes , outvarcopes , n_runs
551
551
552
552
cope_sorter = pe .Node (niu .Function (input_names = ['copes' , 'varcopes' ,
553
- 'conds ' ],
553
+ 'contrasts ' ],
554
554
output_names = ['copes' , 'varcopes' ,
555
555
'n_runs' ],
556
556
function = sort_copes ),
557
557
name = 'cope_sorter' )
558
558
559
559
pickfirst = lambda x : x [0 ]
560
560
561
- wf .connect (subjinfo , 'conds ' , cope_sorter , 'conds ' )
561
+ wf .connect (contrastgen , 'contrasts ' , cope_sorter , 'contrasts ' )
562
562
wf .connect ([(preproc , fixed_fx , [(('outputspec.mask' , pickfirst ),
563
563
'flameo.mask_file' )]),
564
564
(modelfit , cope_sorter , [('outputspec.copes' , 'copes' )]),
0 commit comments