Merge pull request #665 from cpp-lln-lab/olf

[FIX] make sure 2 sample ttest can run more than one contrasts

Author: Remi-Gau

src/batches/stats/setBatchGroupLevelContrasts.m

@@ -85,9 +85,17 @@
 
         spmMatFile = fullfile(getRFXdir(opt, nodeName, contrastsList{j}), 'SPM.mat');
 
-        matlabbatch = setGroupContrast(matlabbatch, opt, spmMatFile, ...
-                                       thisContrast{1}.Name, ...
-                                       thisContrast{1}.Weights);
+        if ~opt.dryRun
+          assert(exist(spmMatFile, 'file') == 2);
+        end
+
+        for iCon = 1:numel(thisContrast)
+          consess{iCon}.tcon.name = thisContrast{iCon}.Name;
+          consess{iCon}.tcon.convec = thisContrast{iCon}.Weights;
+          consess{iCon}.tcon.sessrep = 'none';
+        end
+
+        matlabbatch = setBatchContrasts(matlabbatch, opt, spmMatFile, consess);
 
       end
 

src/batches/stats/setBatchGroupLevelResults.m

@@ -23,8 +23,6 @@
   load(fullfile(result.dir, 'SPM.mat'));
   result.nbSubj = SPM.nscan;
 
-  result.contrastNb = 1;
-
   result.label = 'group';
 
   result.outputName = defaultOuputNameStruct(opt, result);

src/workflows/stats/bidsResults.m

@@ -374,6 +374,7 @@
         if all(ismember(lower(groupBy), {'contrast'}))
 
           result.name = name;
+          result.contrastNb = 1;
           result.dir = getRFXdir(opt, result.nodeName, name);
 
           [matlabbatch, results] = appendToBatch(matlabbatch, opt, results, result);
@@ -389,6 +390,7 @@
 
             thisGroup = availableGroups{iGroup};
             result.name = [thisGroup ' - ' name];
+            result.contrastNb = 1;
             result.dir = getRFXdir(opt, result.nodeName, name, thisGroup);
 
             [matlabbatch, results] = appendToBatch(matlabbatch, opt, results, result);
@@ -400,10 +402,14 @@
       case 'two_sample_t_test'
 
         thisContrast = opt.model.bm.get_contrasts('Name', result.nodeName);
-        result.name = [thisContrast{1}.Name ' - ' name];
+
         result.dir = getRFXdir(opt, result.nodeName, name);
 
-        [matlabbatch, results] = appendToBatch(matlabbatch, opt, results, result);
+        for  iCon = 1:numel(thisContrast)
+          result.name = [thisContrast{iCon}.Name ' - ' name];
+          result.contrastNb = iCon;
+          [matlabbatch, results] = appendToBatch(matlabbatch, opt, results, result);
+        end
 
       otherwise
         msg = sprintf('Node %s has has model type I cannot handle.\n', result.nodeName);

tests/dummyData/models/model-vislocalizer2sampleTTest_smdl.json

@@ -101,6 +101,18 @@
             -1
           ],
           "Test": "t"
+        },
+        {
+          "Name": "ctrl_gt_blind",
+          "ConditionList": [
+            "Group.blind",
+            "Group.ctrl"
+          ],
+          "Weights": [
+            -1,
+            1
+          ],
+          "Test": "t"
         }
       ]
     }

tests/tests_batches/stats/test_setBatchGroupLevelContrasts.m

@@ -8,6 +8,24 @@
   initTestSuite;
 end
 
+function test_setBatchGroupLevelContrasts_between_groups()
+
+  opt = setOptions('vislocalizer', '', 'pipelineType', 'stats');
+
+  opt.model.file = spm_file(opt.model.file, ...
+                            'basename', ...
+                            'model-vislocalizer2sampleTTest_smdl');
+  opt.model.bm = BidsModel('file', opt.model.file);
+
+  matlabbatch = {};
+  matlabbatch = setBatchGroupLevelContrasts(matlabbatch, opt, 'between_groups');
+
+  assertEqual(numel(matlabbatch{1}.spm.stats.con.consess), 2);
+  assertEqual(matlabbatch{1}.spm.stats.con.consess{1}.tcon.name, 'blind_gt_ctrl');
+  assertEqual(matlabbatch{1}.spm.stats.con.consess{2}.tcon.name, 'ctrl_gt_blind');
+
+end
+
 function test_setBatchGroupLevelContrasts_within_group()
 
   opt = setOptions('vislocalizer', '', 'pipelineType', 'stats');