Run level outputs

bclenet · Oct 9, 2023 · f4713fd · f4713fd
1 parent 6eed291
commit f4713fd
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/narps_open/pipelines/team_T54A.py b/narps_open/pipelines/team_T54A.py
@@ -326,9 +326,7 @@ def get_run_level_outputs(self):
         parameters = {
             'run_id' : self.run_list,
             'subject_id' : self.subject_list,
-            'contrast_id' : self.contrast_list,
             'file' : [
-                join('results', 'cope{contrast_id}.nii.gz'),
                 join('results', 'dof'),
                 join('results', 'logfile'),
                 join('results', 'pe10.nii.gz'),
@@ -351,9 +349,6 @@ def get_run_level_outputs(self):
                 join('results', 'res4d.nii.gz'),
                 join('results', 'sigmasquareds.nii.gz'),
                 join('results', 'threshac1.nii.gz'),
-                join('results', 'tstat{contrast_id}.nii.gz'),
-                join('results', 'varcope{contrast_id}.nii.gz'),
-                join('results', 'zstat{contrast_id}.nii.gz'),
                 'run0.mat',
                 'run0.png',
                 'sub-{subject_id}_task-MGT_run-{run_id}_bold_space-MNI152NLin2009cAsym_preproc_brain_mask.nii.gz'
@@ -364,10 +359,31 @@ def get_run_level_outputs(self):
             self.directories.output_dir,
             'l1_analysis', '_run_id_{run_id}_subject_id_{subject_id}','{file}'
             )
+        return_list = [template.format(**dict(zip(parameters.keys(), parameter_values)))\
+            for parameter_values in parameter_sets]
 
-        return [template.format(**dict(zip(parameters.keys(), parameter_values)))\
+        parameters = {
+            'run_id' : self.run_list,
+            'subject_id' : self.subject_list,
+            'contrast_id' : self.contrast_list,
+            'file' : [
+                join('results', 'cope{contrast_id}.nii.gz'),
+                join('results', 'tstat{contrast_id}.nii.gz'),
+                join('results', 'varcope{contrast_id}.nii.gz'),
+                join('results', 'zstat{contrast_id}.nii.gz'),
+            ]
+        }
+        parameter_sets = product(*parameters.values())
+        template = join(
+            self.directories.output_dir,
+            'l1_analysis', '_run_id_{run_id}_subject_id_{subject_id}','{file}'
+            )
+
+        return_list += [template.format(**dict(zip(parameters.keys(), parameter_values)))\
             for parameter_values in parameter_sets]
 
+        return return_list
+
     def get_subject_level_analysis(self):
         """
         Create the subject level analysis workflow.