Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

J7F9 refactorisation #80

Merged
merged 47 commits into from
Jan 5, 2024
Merged
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
15f09ac
[REFAC] pipeline J7F9 to conform with the Pipeline class
bclenet Mar 29, 2023
360dcd0
[TEST] init a test for conftest.py
bclenet Aug 30, 2023
e627174
Merge branch 'main' into j7f9_refac
bclenet Aug 30, 2023
2b45a48
[REFAC] adding analyses outputs
bclenet Aug 30, 2023
ae59600
[TEST] updating tests for J7F9
bclenet Aug 30, 2023
4b7e831
Cleaning connections
bclenet Aug 30, 2023
2d1739a
[TEST] bug with pipelines/test_utils
bclenet Aug 30, 2023
678adfe
[BUG] issue with iterating over dicts
bclenet Aug 31, 2023
4bd3ab5
[BUG] replace mkdir by makedirs in get_parameters
bclenet Aug 31, 2023
4879073
Merge branch 'main' into j7f9_refac
bclenet Aug 31, 2023
6986e90
[BUG] inside unit_tests workflow
bclenet Aug 31, 2023
d6e67f3
Merge branch 'Inria-Empenn:main' into main
bclenet Aug 31, 2023
f88da86
Merge branch 'main' into j7f9_refac
bclenet Aug 31, 2023
691a039
Merge branch 'main' into conftest_testing
bclenet Sep 1, 2023
0f8365a
[TEST] testing the conftest module
bclenet Sep 1, 2023
9789e36
Merge branch 'conftest_testing' into j7f9_refac
bclenet Sep 1, 2023
c3bfc53
Merge branch 'Inria-Empenn:main' into main
bclenet Sep 4, 2023
7d96a18
Merge branch 'main' into j7f9_refac
bclenet Sep 4, 2023
4b30504
Merge branch 'Inria-Empenn:main' into main
bclenet Sep 19, 2023
fd15ffc
Merge branch 'Inria-Empenn:main' into main
bclenet Sep 21, 2023
6ebe5d2
Merge branch 'Inria-Empenn:main' into main
bclenet Sep 29, 2023
0a584dd
Merge branch 'Inria-Empenn:main' into main
bclenet Sep 29, 2023
e284b80
Merge branch 'Inria-Empenn:main' into main
bclenet Sep 29, 2023
5774813
Merge branch 'Inria-Empenn:main' into main
bclenet Oct 5, 2023
8f12d3d
Merge branch 'Inria-Empenn:main' into main
bclenet Oct 5, 2023
91dc744
Merge branch 'Inria-Empenn:main' into main
bclenet Oct 10, 2023
c03e9d1
Merge branch 'Inria-Empenn:main' into main
bclenet Nov 20, 2023
fe0d25b
Merge branch 'Inria-Empenn:main' into main
bclenet Nov 22, 2023
04d5ff2
Merge branch 'Inria-Empenn:main' into main
bclenet Nov 22, 2023
e0c51e5
Merge branch 'main' into j7f9_refac
bclenet Jan 3, 2024
afae43e
[REFAC] [skip ci]
bclenet Jan 3, 2024
81cfbae
[TEST] test get_confounds method [skip ci]
bclenet Jan 3, 2024
3f7441c
[TEST] test get_confounds method [skip ci]
bclenet Jan 3, 2024
9b759df
[PEP8] [skip ci]
bclenet Jan 3, 2024
4ec1cf6
[BUG] runs inputs of get_subject_information no longer needed [skip ci]
bclenet Jan 3, 2024
2dd6525
[BUG] get_confounds input [skip ci]
bclenet Jan 3, 2024
ccb6cd7
[BUG] get_confounds input [skip ci]
bclenet Jan 3, 2024
015e9c7
Cleaning code [skip ci]
bclenet Jan 4, 2024
e2bdee4
[BUG] real subject ids for search patterns [skip ci]
bclenet Jan 4, 2024
cfa7279
Consistent Bunches along runs as output of subject_information [skip ci]
bclenet Jan 4, 2024
4f5ff0a
[BUG] with subject_information Bunch [skip ci]
bclenet Jan 4, 2024
a9ab13a
Bug with group level [skip ci]
bclenet Jan 4, 2024
fc37fda
Remove large files earlier in the process [skip ci]
bclenet Jan 5, 2024
7a03d52
[TEST] exhaustive testing of get_subject_information for J7F9 [skip ci]
bclenet Jan 5, 2024
c9ee889
Merge branch 'Inria-Empenn:main' into main
bclenet Jan 5, 2024
a06cd8b
Merge branch 'main' into j7f9_refac [skip ci]
bclenet Jan 5, 2024
b2dd381
[BUG] get_contrasts_2 iterfield [skip ci]
bclenet Jan 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cleaning code [skip ci]
bclenet committed Jan 4, 2024
commit 015e9c724f21ad9ced17997459c14f2d53191b13
8 changes: 3 additions & 5 deletions narps_open/pipelines/team_J7F9.py
Original file line number Diff line number Diff line change
@@ -85,7 +85,7 @@ def get_subject_information(event_files):
weights_loss.append(float(info[3]))

# Missed trials
if float(info[4]) < 0.1 or str(info[5]) == 'NoResp':
if float(info[4]) < 0.1 or 'NoResp' in info[5]:
onsets_missed.append(float(info[0]))
durations_missed.append(0.0)

@@ -258,16 +258,13 @@ def get_subject_level_analysis(self):
)
subject_level_analysis.connect([
(information_source, select_files, [('subject_id', 'subject_id')]),
(information_source, remove_gunzip_files, [('subject_id', 'subject_id')]),
(information_source, remove_smoothed_files, [('subject_id', 'subject_id')]),
(subject_information, specify_model, [('subject_info', 'subject_info')]),
(select_files, confounds, [('confounds', 'filepath')]),
(select_files, subject_information, [('event', 'event_files')]),
(information_source, confounds, [('subject_id', 'subject_id')]),
(select_files, gunzip_func, [('func', 'in_file')]),
(gunzip_func, smoothing, [('out_file', 'in_files')]),
(gunzip_func, remove_gunzip_files, [('out_file', 'file_name')]),
(smoothing, remove_gunzip_files, [('smoothed_files', '_')]),
(smoothing, remove_smoothed_files, [('smoothed_files', 'file_name')]),
(smoothing, specify_model, [('smoothed_files', 'functional_runs')]),
(confounds, specify_model, [('confounds_file', 'realignment_parameters')]),
@@ -281,7 +278,8 @@ def get_subject_level_analysis(self):
('con_images', 'subject_level_analysis.@con_images'),
('spmT_images', 'subject_level_analysis.@spmT_images'),
('spm_mat_file', 'subject_level_analysis.@spm_mat_file')]),
(contrast_estimate, remove_smoothed_files, [('spmT_images', '_')])
(data_sink, remove_smoothed_files, [('out_file', '_')]),
(data_sink, remove_gunzip_files, [('out_file', '_')])
])

return subject_level_analysis