From 742f967800e88abc3a202f5f8bd70ee529abd713 Mon Sep 17 00:00:00 2001 From: elodiegermani1 Date: Thu, 21 Sep 2023 14:24:42 -0400 Subject: [PATCH] [REPRO] correction of bugs for tests. --- narps_open/pipelines/team_3C6G.py | 11 +++++------ tests/pipelines/test_team_3C6G.py | 6 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/narps_open/pipelines/team_3C6G.py b/narps_open/pipelines/team_3C6G.py index 210d468a..46ecae08 100644 --- a/narps_open/pipelines/team_3C6G.py +++ b/narps_open/pipelines/team_3C6G.py @@ -451,9 +451,9 @@ def get_subject_level_analysis(self): templates = { 'func': join( self.directories.results_dir, - 'preprocess', + 'preprocessing', '_run_id_*_subject_id_{subject_id}', - 'complete_filename_{subject_id}_complete_filename.nii', + 'swrrsub-{subject_id}_task-MGT_run-*_bold.nii', ), 'event': join( self.directories.dataset_dir, @@ -463,11 +463,10 @@ def get_subject_level_analysis(self): ), 'parameters': join( self.directories.results_dir, - 'preprocess', + 'preprocessing', '_run_id_*_subject_id_{subject_id}', - 'complete_filename_{subject_id}_complete_filename.txt', + 'rp_sub-{subject_id}_task-MGT_run-*_bold.txt', ) - } # SelectFiles node - to select necessary files @@ -597,7 +596,7 @@ def get_subject_level_analysis(self): ), ( contrast_estimate, - datasink, + data_sink, [('con_images', 'l1_analysis.@con_images'), ('spmT_images', 'l1_analysis.@spmT_images'), ('spm_mat_file', 'l1_analysis.@spm_mat_file')] diff --git a/tests/pipelines/test_team_3C6G.py b/tests/pipelines/test_team_3C6G.py index 5917949c..db3f268d 100644 --- a/tests/pipelines/test_team_3C6G.py +++ b/tests/pipelines/test_team_3C6G.py @@ -50,7 +50,7 @@ def test_outputs(): pipeline.run_list = ['01'] assert len(pipeline.get_preprocessing_outputs()) == 14 assert len(pipeline.get_run_level_outputs()) == 0 - #assert len(pipeline.get_subject_level_outputs()) == 7 + assert len(pipeline.get_subject_level_outputs()) == 7 #assert len(pipeline.get_group_level_outputs()) == 63 #assert len(pipeline.get_hypotheses_outputs()) == 18 @@ -59,7 +59,7 @@ def test_outputs(): pipeline.run_list = ['01', '02', '03', '04'] assert len(pipeline.get_preprocessing_outputs()) == 56 assert len(pipeline.get_run_level_outputs()) == 0 - #assert len(pipeline.get_subject_level_outputs()) == 7 + assert len(pipeline.get_subject_level_outputs()) == 7 #assert len(pipeline.get_group_level_outputs()) == 63 #assert len(pipeline.get_hypotheses_outputs()) == 18 @@ -68,7 +68,7 @@ def test_outputs(): pipeline.run_list = ['01', '02', '03', '04'] assert len(pipeline.get_preprocessing_outputs()) == 224 assert len(pipeline.get_run_level_outputs()) == 0 - #assert len(pipeline.get_subject_level_outputs()) == 28 + assert len(pipeline.get_subject_level_outputs()) == 28 #assert len(pipeline.get_group_level_outputs()) == 63 #assert len(pipeline.get_hypotheses_outputs()) == 18