[BUG] group level analyses names

bclenet · Jan 26, 2024 · 7dd85b2 · 7dd85b2
1 parent 4d3aa8e
commit 7dd85b2
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/narps_open/pipelines/team_U26C.py b/narps_open/pipelines/team_U26C.py
@@ -414,7 +414,7 @@ def get_group_level_analysis_single_group(self, method):
         # Create the group level workflow
         group_level_analysis = Workflow(
             base_dir = self.directories.working_dir,
-            name = f'group_level_analysis_nsub_{nb_subjects}')
+            name = f'group_level_analysis_{method}_nsub_{nb_subjects}')
         group_level_analysis.connect([
             (infosource, selectderivs, [('contrast_id', 'contrast_id')]),
             (selectderivs, get_contrasts, [('contrasts', 'input_str')]),
@@ -436,13 +436,13 @@ def get_group_level_analysis_single_group(self, method):
                 ('spmT_images', 'stat_image')
                 ]),
             (level2estimate, data_sink, [
-                ('mask_image', f'group_level_analysis_{method}_nsub_{nb_subjects}.@mask')]),
+                ('mask_image', f'{group_level_analysis.name}.@mask')]),
             (level2conestimate, data_sink, [
-                ('spm_mat_file', f'group_level_analysis_{method}_nsub_{nb_subjects}.@spm_mat'),
-                ('spmT_images', f'group_level_analysis_{method}_nsub_{nb_subjects}.@T'),
-                ('con_images', f'group_level_analysis_{method}_nsub_{nb_subjects}.@con')]),
+                ('spm_mat_file', f'{group_level_analysis.name}.@spm_mat'),
+                ('spmT_images', f'{group_level_analysis.name}.@T'),
+                ('con_images', f'{group_level_analysis.name}.@con')]),
             (threshold, data_sink, [
-                ('thresholded_map', f'group_level_analysis_{method}_nsub_{nb_subjects}.@thresh')])
+                ('thresholded_map', f'{group_level_analysis.name}.@thresh')])
             ])
 
         return group_level_analysis
@@ -579,13 +579,13 @@ def get_group_level_analysis_group_comparison(self):
                 ('spmT_images', 'stat_image')
                 ]),
             (level2estimate, data_sink, [
-                ('mask_image', f'group_level_analysis_groupComp_nsub_{nb_subjects}.@mask')]),
+                ('mask_image', f'{group_level_analysis.name}.@mask')]),
             (level2conestimate, data_sink, [
-                ('spm_mat_file', f'group_level_analysis_groupComp_nsub_{nb_subjects}.@spm_mat'),
-                ('spmT_images', f'group_level_analysis_groupComp_nsub_{nb_subjects}.@T'),
-                ('con_images', f'group_level_analysis_groupComp_nsub_{nb_subjects}.@con')]),
+                ('spm_mat_file', f'{group_level_analysis.name}.@spm_mat'),
+                ('spmT_images', f'{group_level_analysis.name}.@T'),
+                ('con_images', f'{group_level_analysis.name}.@con')]),
             (threshold, data_sink, [
-                ('thresholded_map', f'group_level_analysis_groupComp_nsub_{nb_subjects}.@thresh')])
+                ('thresholded_map', f'{group_level_analysis.name}.@thresh')])
             ])
 
         return group_level_analysis