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

98BT bug with subject IDs #183

Merged
merged 44 commits into from
Mar 6, 2024
Merged
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
6986e90
[BUG] inside unit_tests workflow
bclenet Aug 31, 2023
d6e67f3
Merge branch 'Inria-Empenn:main' into main
bclenet Aug 31, 2023
c3bfc53
Merge branch 'Inria-Empenn:main' into main
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
839895f
Refactoring pipeline 98BT
bclenet Oct 4, 2023
ec0f8f2
[TEST] update tests [REFAC] pep8 and bug correction
bclenet Oct 4, 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
eb2b118
Merge branch 'main' into 98BT_refac
bclenet Oct 5, 2023
1f0a528
Using narps_open.data.task module inside 98BT
bclenet Oct 5, 2023
3e9c01a
[TEST] update + dependancy to niflow
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
ecf2b11
Merge branch 'main' into 98BT_refac
bclenet Jan 3, 2024
3bedbfd
[REFAC][skip ci]
bclenet Jan 3, 2024
c9ee889
Merge branch 'Inria-Empenn:main' into main
bclenet Jan 5, 2024
1530159
Merge branch 'main' into 98BT_refac [skip ci]
bclenet Jan 5, 2024
c8bddd8
[BUG] input of get_contrats [skip ci]
bclenet Jan 5, 2024
2a8ea4a
Merge branch 'main' into 98BT_refac
bclenet Jan 29, 2024
2d35726
Light bugs + remove large files [skip ci]
bclenet Jan 30, 2024
9831d37
[TEST] adding tests for 98BT
bclenet Feb 6, 2024
c04ba9c
Merge branch 'main' into 98BT_refac
bclenet Feb 6, 2024
acd4548
[TEST] adding tests for 98BT
bclenet Feb 6, 2024
50dff7b
[TEST] adding tests for 98BT
bclenet Feb 6, 2024
bab6126
Output names for 98BT
bclenet Feb 6, 2024
ea8b5c3
Preprocessing output names
bclenet Feb 6, 2024
6c4204e
Subject info issue + output names
bclenet Feb 7, 2024
e641b1e
98BT - Refac get_parameters_files
bclenet Feb 7, 2024
355e33a
[TEST] 98BT get_parameters_file
bclenet Feb 7, 2024
36ff807
Merge branch 'main' into 98BT_refac
bclenet Feb 7, 2024
7bbf479
Using fixture for temporary test dir creation / removal
bclenet Feb 7, 2024
c7cc9e2
Linting pipelines test files
bclenet Feb 7, 2024
f460ed8
Bug with regressors naming
bclenet Feb 7, 2024
c02451b
Merge branch 'main' into 98BT_refac
bclenet Feb 19, 2024
38af98f
pylintrc for pylint config
bclenet Feb 19, 2024
8741d5e
Merge branch 'main' into 98BT_refac
bclenet Mar 6, 2024
b5188e9
Subject ID completion in get_contrast
bclenet Mar 6, 2024
4b123c8
Merge branch 'main' into 98BT_refac
bclenet Mar 6, 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
[TEST] update + dependancy to niflow
bclenet committed Oct 5, 2023
commit 3e9c01ac33c586de92a2ae359aee427a58cec4c9
10 changes: 7 additions & 3 deletions narps_open/pipelines/team_98BT.py
Original file line number Diff line number Diff line change
@@ -325,7 +325,11 @@ def get_preprocessing(self):

def get_preprocessing_outputs(self):
""" Return the names of the files the preprocessing is supposed to generate. """
return []

def get_run_level_analysis(self):
""" No run level analysis has been done by team 98BT """
return None

def get_parameters_files(
parameters_files, wc2_file, motion_corrected_files, subject_id, working_dir):
@@ -351,9 +355,9 @@ def get_parameters_files(

from warnings import simplefilter
# ignore all future warnings
simplefilter(action='ignore', category=FutureWarning)
simplefilter(action='ignore', category=UserWarning)
simplefilter(action='ignore', category=RuntimeWarning)
simplefilter(action = 'ignore', category = FutureWarning)
simplefilter(action = 'ignore', category = UserWarning)
simplefilter(action = 'ignore', category = RuntimeWarning)

# Load wc2 file and create a mask out of it
wc2 = load(wc2_file)
4 changes: 2 additions & 2 deletions narps_open/utils/configuration/testing_config.toml
Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@ title = "Testing configuration for the NARPS open pipelines project"
config_type = "testing"

[directories]
dataset = "run/data/ds001734/"
dataset = "data/original/ds001734/"
reproduced_results = "run/data/reproduced/"
narps_results = "run/data/results/"
narps_results = "data/results/"
test_data = "tests/test_data/"
test_runs = "run/"

3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -19,7 +19,8 @@
'networkx>=2.0,<3.0', # a workaround to nipype's bug (issue 3530)
'nilearn>=0.10.0,<0.11',
'nipype',
'pandas'
'pandas',
'niflow-nipype1-workflows>=0.0.5,<0.1.0'
]
extras_require = {
'tests': [
8 changes: 4 additions & 4 deletions tests/pipelines/test_team_98BT.py
Original file line number Diff line number Diff line change
@@ -53,16 +53,16 @@ def test_outputs():
pipeline.subject_list = ['001']
assert len(pipeline.get_preprocessing_outputs()) == 0
assert len(pipeline.get_run_level_outputs()) == 0
assert len(pipeline.get_subject_level_outputs()) == 7
assert len(pipeline.get_group_level_outputs()) == 63
assert len(pipeline.get_subject_level_outputs()) == 9
assert len(pipeline.get_group_level_outputs()) == 84
assert len(pipeline.get_hypotheses_outputs()) == 18

# 2 - 4 subjects outputs
pipeline.subject_list = ['001', '002', '003', '004']
assert len(pipeline.get_preprocessing_outputs()) == 0
assert len(pipeline.get_run_level_outputs()) == 0
assert len(pipeline.get_subject_level_outputs()) == 28
assert len(pipeline.get_group_level_outputs()) == 63
assert len(pipeline.get_subject_level_outputs()) == 36
assert len(pipeline.get_group_level_outputs()) == 84
assert len(pipeline.get_hypotheses_outputs()) == 18

@staticmethod