[FIX] report proper fold number in labelfold.tsv (#989)

* demonstrate bug

* fix

Author: Remi-Gau

src/stats/utils/getRegressorIdx.m

@@ -1,8 +1,9 @@
 function  [cdtName, regIdx, status] = getRegressorIdx(cdtName, SPM)
   %
-  % Gets from the SPM structure the regressors index
-  % corresponding to the a condition convolved with the
-  % canonical HRF. This can also look for non convolved conditions to identify a confound regressor.
+  % Gets from the SPM structure the regressors index corresponding
+  % to the a condition convolved with the canonical HRF.
+  % This can also look for non convolved conditions
+  % to identify a confound regressor.
   %
   % Throws a warning if there is no regressor for that condition.
   %

src/workflows/stats/bidsConcatBetaTmaps.m

@@ -44,7 +44,7 @@ function bidsConcatBetaTmaps(opt, deleteTmaps)
 
     ffxDir = getFFXdir(subLabel, opt);
 
-    load(fullfile(ffxDir, 'SPM.mat'));
+    load(fullfile(ffxDir, 'SPM.mat'), 'SPM');
 
     model = BidsModel('file', opt.model.file);
 
@@ -86,7 +86,7 @@ function bidsConcatBetaTmaps(opt, deleteTmaps)
       for iSess = 1:numel(SPM.Sess)
         tmp(iSess) = ismember(betasIndices, SPM.Sess(iSess).col); %#ok<*AGROW>
       end
-      runs(iContrast, 1) = find(any(tmp, 2));
+      runs(iContrast, 1) = find(any(tmp, 1));
       clear tmp;
 
       parts = strsplit(SPM.xX.name{betasIndices}, ' ');

tests/tests_workflows/test_bidsConcatBetaTmaps.m

@@ -19,16 +19,55 @@ function test_bidsConcatBetaTmapsBasic()
   opt.model.file = spm_file(opt.model.file, 'filename', 'model-vismotionMVPA_smdl.json');
   opt.model.bm = BidsModel('file', opt.model.file);
 
+  tmpDir = tempname;
+  copyfile(opt.dir.stats, tmpDir);
+
+  opt.dir.stats = tmpDir;
+
+  % update content of FFX dir to mock 2 sessions
+  targetDir = fullfile(opt.dir.stats, ...
+                       ['sub-' subLabel], ...
+                       'task-vismotion_space-IXI549Space_FWHM-6');
+
+  prefixes = {'beta', 'spmT'};
+  for iPrefix = 1:numel(prefixes)
+    files = spm_select('FPList', targetDir, ['^' prefixes{iPrefix} '.*nii']);
+    for i = 1:size(files, 1)
+      number = sprintf('%04.0f', i + size(files, 1));
+      newFile = spm_file(files(i, :), ...
+                         'filename', ...
+                         ['beta_' number '.nii']);
+      copyfile(files(i, :), newFile);
+    end
+  end
+
+  load(fullfile(targetDir, 'SPM.mat'), 'SPM');
+
+  names = SPM.xX.name; %#ok<*NODEF>
+  for i = 1:numel(SPM.xX.name)
+    new_name = strrep(names{i}, 'Sn(1)', 'Sn(2)');
+    names{end + 1} = new_name; %#ok<AGROW>
+  end
+  SPM.xX.name = names;
+
+  SPM.Sess(2).col = SPM.Sess(1).col + numel(SPM.Sess(1).col);
+
+  save(fullfile(targetDir, 'SPM.mat'), 'SPM');
+
+  %% act
   bidsConcatBetaTmaps(opt);
 
+  %% assert
   ffxDir = getFFXdir(subLabel, opt);
   content = bids.util.tsvread(fullfile(ffxDir, ...
                                        'sub-01_task-vismotion_space-IXI549Space_labelfold.tsv'));
 
-  expectedContent = struct('labels', {{'VisMot*bf(1)'; 'VisStat*bf(1)'}}, 'folds', [1; 1]);
+  expectedContent = struct('labels', {{'VisMot*bf(1)'; ...
+                                       'VisMot*bf(1)'; ...
+                                       'VisStat*bf(1)'; ...
+                                       'VisStat*bf(1)'}}, ...
+                           'folds', [1; 2; 1; 2]);
 
   assertEqual(content, expectedContent);
 
-  delete(fullfile(ffxDir, 'sub-01_task-vismotion_space-IXI549Space_labelfold.tsv'));
-
 end