Skip to content

Commit

Permalink
Bug with contrasts Node naming
Browse files Browse the repository at this point in the history
  • Loading branch information
bclenet committed Oct 24, 2023
1 parent 8d907cd commit 1ea7e12
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions narps_open/pipelines/team_08MQ.py
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ def get_preprocessing(self):
(smoothing, remove_func_2, [('smoothed_file', 'files')]),
(alignment_func_to_anat, remove_func_2, [('out_file', '_')]),
(alignment_func_to_anat, remove_func_3, [('out_file', 'files')]),
(alignment_func_to_mni, remove_func_3, [('out', '_')])
(alignment_func_to_mni, remove_func_3, [('output_image', '_')])
])

return preprocessing
Expand Down Expand Up @@ -851,7 +851,7 @@ def get_group_level_analysis_sub_workflow(self, method):
data_sink.inputs.base_directory = self.directories.output_dir

# Function Node get_subgroups_contrasts - Get the contrast files for each subgroup
contrasts = Node(
get_contrasts = Node(
Function(
function = self.get_subgroups_contrasts,
input_names = ['copes', 'varcopes', 'subject_ids', 'participants_file'],
Expand All @@ -866,7 +866,7 @@ def get_group_level_analysis_sub_workflow(self, method):
'varcopes_global'
]
),
name = 'contrasts',
name = 'get_contrasts',
)

# Function Node get_regressors - Get regressors
Expand Down Expand Up @@ -921,13 +921,13 @@ def get_group_level_analysis_sub_workflow(self, method):
)
group_level_analysis.connect([
(info_source, select_files, [('contrast_id', 'contrast_id')]),
(info_source, contrasts, [('subject_list', 'subject_ids')]),
(select_files, contrasts, [
(info_source, get_contrasts, [('subject_list', 'subject_ids')]),
(select_files, get_contrasts, [
('cope', 'copes'),
('varcope', 'varcopes'),
('participants', 'participants_file'),
]),
(contrasts, regressors, [
(get_contrasts, regressors, [
('equalRange_id', 'equalRange_id'),
('equalIndifference_id', 'equalIndifference_id')
]),
Expand All @@ -939,14 +939,14 @@ def get_group_level_analysis_sub_workflow(self, method):

if method == 'equalIndifference':
group_level_analysis.connect([
(contrasts, merge_copes, [('copes_equalIndifference', 'in_files')]),
(contrasts, merge_varcopes, [('varcopes_equalIndifference', 'in_files')])
(get_contrasts, merge_copes, [('copes_equalIndifference', 'in_files')]),
(get_contrasts, merge_varcopes, [('varcopes_equalIndifference', 'in_files')])
])

elif method == 'equalRange':
group_level_analysis.connect([
(contrasts, merge_copes, [('copes_equalRange', 'in_files')]),
(contrasts, merge_varcopes, [('varcopes_equalRange', 'in_files')])
(get_contrasts, merge_copes, [('copes_equalRange', 'in_files')]),
(get_contrasts, merge_varcopes, [('varcopes_equalRange', 'in_files')])
])

elif method == 'groupComp':
Expand Down

0 comments on commit 1ea7e12

Please sign in to comment.