Output file names

bclenet · Apr 11, 2024 · 55766a4 · 55766a4
1 parent 8b1368a
commit 55766a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/narps_open/pipelines/team_3TR7.py b/narps_open/pipelines/team_3TR7.py
@@ -278,10 +278,6 @@ def get_subject_level_outputs(self):
         templates += [join(
             self.directories.output_dir,
             'subject_level', '_subject_id_{subject_id}', 'SPM.mat')]
-        templates += [join(
-            self.directories.output_dir,
-            'subject_level', '_subject_id_{subject_id}', f'spmT_{contrast_id}.nii')\
-            for contrast_id in self.contrast_list]
 
         # Format with subject_ids
         return_list = []
@@ -598,8 +594,7 @@ def get_group_level_outputs(self):
             'contrast_id': self.contrast_list,
             'method': ['groupComp'],
             'file': [
-                'con_0001.nii', 'mask.nii', 'SPM.mat', 'spmT_0001.nii',
-                join('_threshold0', 'spmT_0001_thr.nii')
+                'con_0001.nii', 'mask.nii', 'SPM.mat', 'spmT_0001.nii', 'spmT_0001_thr.nii'
                 ],
             'nb_subjects' : [str(len(self.subject_list))]
         }

diff --git a/tests/pipelines/test_team_3TR7.py b/tests/pipelines/test_team_3TR7.py
@@ -50,11 +50,11 @@ def test_outputs():
         pipeline = PipelineTeam3TR7()
         # 1 - 1 subject outputs
         pipeline.subject_list = ['001']
-        helpers.test_pipeline_outputs(pipeline, [0, 0, 5, 8*2*2 + 5*2, 18])
+        helpers.test_pipeline_outputs(pipeline, [0, 0, 3, 8*2*2 + 5*2, 18])
 
         # 2 - 4 subjects outputs
         pipeline.subject_list = ['001', '002', '003', '004']
-        helpers.test_pipeline_outputs(pipeline, [0, 0, 20, 8*2*2 + 5*2, 18])
+        helpers.test_pipeline_outputs(pipeline, [0, 0, 12, 8*2*2 + 5*2, 18])
 
     @staticmethod
     @mark.unit_test