@@ -389,7 +389,7 @@ def _generate_standard_design(
389
389
if hasattr (info , "conditions" ) and info .conditions is not None :
390
390
for cid , cond in enumerate (info .conditions ):
391
391
sessinfo [i ]["cond" ].insert (cid , dict ())
392
- sessinfo [i ]["cond" ][cid ]["name" ] = info . conditions [ cid ]
392
+ sessinfo [i ]["cond" ][cid ]["name" ] = cond
393
393
scaled_onset = scale_timings (
394
394
info .onsets [cid ],
395
395
self .inputs .input_units ,
@@ -434,12 +434,12 @@ def _generate_standard_design(
434
434
sessinfo [i ]["regress" ][j ]["name" ] = info .regressor_names [j ]
435
435
else :
436
436
sessinfo [i ]["regress" ][j ]["name" ] = "UR%d" % (j + 1 )
437
- sessinfo [i ]["regress" ][j ]["val" ] = info . regressors [ j ]
437
+ sessinfo [i ]["regress" ][j ]["val" ] = r
438
438
sessinfo [i ]["scans" ] = functional_runs [i ]
439
439
440
440
if realignment_parameters is not None :
441
441
for i , rp in enumerate (realignment_parameters ):
442
- mc = realignment_parameters [ i ]
442
+ mc = rp
443
443
for col in range (mc .shape [1 ]):
444
444
colidx = len (sessinfo [i ]["regress" ])
445
445
sessinfo [i ]["regress" ].insert (colidx , dict (name = "" , val = []))
@@ -597,14 +597,14 @@ def _concatenate_info(self, infolist):
597
597
for i , info in enumerate (infolist [1 :]):
598
598
# info.[conditions, tmod] remain the same
599
599
if info .onsets :
600
- for j , val in enumerate (info .onsets ):
600
+ for j , onsets in enumerate (info .onsets ):
601
601
if self .inputs .input_units == "secs" :
602
- onsets = np .array (
603
- info . onsets [ j ]
604
- ) + self . inputs . time_repetition * sum ( nscans [ 0 : ( i + 1 )])
602
+ onsets = np .array (onsets ) + self . inputs . time_repetition * sum (
603
+ nscans [ 0 : ( i + 1 ) ]
604
+ )
605
605
infoout .onsets [j ].extend (onsets .tolist ())
606
606
else :
607
- onsets = np .array (info . onsets [ j ] ) + sum (nscans [0 : (i + 1 )])
607
+ onsets = np .array (onsets ) + sum (nscans [0 : (i + 1 )])
608
608
infoout .onsets [j ].extend (onsets .tolist ())
609
609
610
610
for j , val in enumerate (info .durations ):
@@ -621,8 +621,8 @@ def _concatenate_info(self, infolist):
621
621
)
622
622
623
623
if hasattr (info , "amplitudes" ) and info .amplitudes :
624
- for j , val in enumerate (info .amplitudes ):
625
- infoout .amplitudes [j ].extend (info . amplitudes [ j ] )
624
+ for j , amplitudes in enumerate (info .amplitudes ):
625
+ infoout .amplitudes [j ].extend (amplitudes )
626
626
627
627
if hasattr (info , "pmod" ) and info .pmod :
628
628
for j , val in enumerate (info .pmod ):
@@ -633,8 +633,8 @@ def _concatenate_info(self, infolist):
633
633
if hasattr (info , "regressors" ) and info .regressors :
634
634
# assumes same ordering of regressors across different
635
635
# runs and the same names for the regressors
636
- for j , v in enumerate (info .regressors ):
637
- infoout .regressors [j ].extend (info . regressors [ j ] )
636
+ for j , regressors in enumerate (info .regressors ):
637
+ infoout .regressors [j ].extend (regressors )
638
638
639
639
# insert session regressors
640
640
if not hasattr (infoout , "regressors" ) or not infoout .regressors :
0 commit comments