Skip to content

Commit 73e4ccd

Browse files
committed
BIDS: Rename regressors -> timeseries
1 parent ea32584 commit 73e4ccd

File tree

11 files changed

+38
-30
lines changed

11 files changed

+38
-30
lines changed

.circleci/ds005_fasttrack_outputs.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
fmriprep
2+
fmriprep/.bidsignore
23
fmriprep/dataset_description.json
34
fmriprep/desc-aparcaseg_dseg.tsv
45
fmriprep/desc-aseg_dseg.tsv
@@ -10,8 +11,8 @@ fmriprep/logs/CITATION.tex
1011
fmriprep/sub-01
1112
fmriprep/sub-01/func
1213
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_AROMAnoiseICs.csv
13-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_desc-confounds_regressors.json
14-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_desc-confounds_regressors.tsv
14+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_desc-confounds_timeseries.json
15+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_desc-confounds_timeseries.tsv
1516
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_desc-MELODIC_mixing.tsv
1617
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_from-scanner_to-T1w_mode-image_xfm.txt
1718
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_from-T1w_to-scanner_mode-image_xfm.txt
@@ -44,8 +45,8 @@ fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-T1w_desc-brain_mas
4445
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-T1w_desc-preproc_bold.json
4546
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-T1w_desc-preproc_bold.nii.gz
4647
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_AROMAnoiseICs.csv
47-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_desc-confounds_regressors.json
48-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_desc-confounds_regressors.tsv
48+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_desc-confounds_timeseries.json
49+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_desc-confounds_timeseries.tsv
4950
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_desc-MELODIC_mixing.tsv
5051
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_from-scanner_to-T1w_mode-image_xfm.txt
5152
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_from-T1w_to-scanner_mode-image_xfm.txt

.circleci/ds005_outputs.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
fmriprep
2+
fmriprep/.bidsignore
23
fmriprep/dataset_description.json
34
fmriprep/desc-aparcaseg_dseg.tsv
45
fmriprep/desc-aseg_dseg.tsv
@@ -51,8 +52,8 @@ fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_label-GM_probseg.nii.gz
5152
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_label-WM_probseg.nii.gz
5253
fmriprep/sub-01/func
5354
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_AROMAnoiseICs.csv
54-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_desc-confounds_regressors.json
55-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_desc-confounds_regressors.tsv
55+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_desc-confounds_timeseries.json
56+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_desc-confounds_timeseries.tsv
5657
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_desc-MELODIC_mixing.tsv
5758
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_from-scanner_to-T1w_mode-image_xfm.txt
5859
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_from-T1w_to-scanner_mode-image_xfm.txt
@@ -85,8 +86,8 @@ fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-T1w_desc-brain_mas
8586
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-T1w_desc-preproc_bold.json
8687
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-T1w_desc-preproc_bold.nii.gz
8788
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_AROMAnoiseICs.csv
88-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_desc-confounds_regressors.json
89-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_desc-confounds_regressors.tsv
89+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_desc-confounds_timeseries.json
90+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_desc-confounds_timeseries.tsv
9091
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_desc-MELODIC_mixing.tsv
9192
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_from-scanner_to-T1w_mode-image_xfm.txt
9293
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_from-T1w_to-scanner_mode-image_xfm.txt

.circleci/ds005_partial_fasttrack_outputs.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
fmriprep
2+
fmriprep/.bidsignore
23
fmriprep/dataset_description.json
34
fmriprep/desc-aparcaseg_dseg.tsv
45
fmriprep/desc-aseg_dseg.tsv
@@ -10,8 +11,8 @@ fmriprep/logs/CITATION.tex
1011
fmriprep/sub-01
1112
fmriprep/sub-01/func
1213
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_AROMAnoiseICs.csv
13-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_desc-confounds_regressors.json
14-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_desc-confounds_regressors.tsv
14+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_desc-confounds_timeseries.json
15+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_desc-confounds_timeseries.tsv
1516
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_desc-MELODIC_mixing.tsv
1617
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_from-scanner_to-T1w_mode-image_xfm.txt
1718
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-2_from-T1w_to-scanner_mode-image_xfm.txt

.circleci/ds005_partial_outputs.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
fmriprep
2+
fmriprep/.bidsignore
23
fmriprep/dataset_description.json
34
fmriprep/desc-aparcaseg_dseg.tsv
45
fmriprep/desc-aseg_dseg.tsv
@@ -51,8 +52,8 @@ fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_label-GM_probseg.nii.gz
5152
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_label-WM_probseg.nii.gz
5253
fmriprep/sub-01/func
5354
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_AROMAnoiseICs.csv
54-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-confounds_regressors.json
55-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-confounds_regressors.tsv
55+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-confounds_timeseries.json
56+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-confounds_timeseries.tsv
5657
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-MELODIC_mixing.tsv
5758
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_from-scanner_to-T1w_mode-image_xfm.txt
5859
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_from-T1w_to-scanner_mode-image_xfm.txt

.circleci/ds054_fasttrack_outputs.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
fmriprep
2+
fmriprep/.bidsignore
23
fmriprep/dataset_description.json
34
fmriprep/logs
45
fmriprep/logs/CITATION.bib
@@ -10,8 +11,8 @@ fmriprep/sub-100185/func
1011
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_boldref.nii.gz
1112
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_desc-brain_mask.json
1213
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_desc-brain_mask.nii.gz
13-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_desc-confounds_regressors.json
14-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_desc-confounds_regressors.tsv
14+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_desc-confounds_timeseries.json
15+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_desc-confounds_timeseries.tsv
1516
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_desc-preproc_bold.json
1617
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_desc-preproc_bold.nii.gz
1718
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_from-scanner_to-T1w_mode-image_xfm.txt
@@ -29,8 +30,8 @@ fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_space-T1w_desc-prepro
2930
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_boldref.nii.gz
3031
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_desc-brain_mask.json
3132
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_desc-brain_mask.nii.gz
32-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_desc-confounds_regressors.json
33-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_desc-confounds_regressors.tsv
33+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_desc-confounds_timeseries.json
34+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_desc-confounds_timeseries.tsv
3435
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_desc-preproc_bold.json
3536
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_desc-preproc_bold.nii.gz
3637
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_from-scanner_to-T1w_mode-image_xfm.txt

.circleci/ds054_outputs.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
fmriprep
2+
fmriprep/.bidsignore
23
fmriprep/dataset_description.json
34
fmriprep/logs
45
fmriprep/logs/CITATION.bib
@@ -29,8 +30,8 @@ fmriprep/sub-100185/func
2930
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_boldref.nii.gz
3031
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_desc-brain_mask.json
3132
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_desc-brain_mask.nii.gz
32-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_desc-confounds_regressors.json
33-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_desc-confounds_regressors.tsv
33+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_desc-confounds_timeseries.json
34+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_desc-confounds_timeseries.tsv
3435
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_desc-preproc_bold.json
3536
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_desc-preproc_bold.nii.gz
3637
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_from-scanner_to-T1w_mode-image_xfm.txt
@@ -48,8 +49,8 @@ fmriprep/sub-100185/func/sub-100185_task-machinegame_run-1_space-T1w_desc-prepro
4849
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_boldref.nii.gz
4950
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_desc-brain_mask.json
5051
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_desc-brain_mask.nii.gz
51-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_desc-confounds_regressors.json
52-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_desc-confounds_regressors.tsv
52+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_desc-confounds_timeseries.json
53+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_desc-confounds_timeseries.tsv
5354
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_desc-preproc_bold.json
5455
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_desc-preproc_bold.nii.gz
5556
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-2_from-scanner_to-T1w_mode-image_xfm.txt

.circleci/ds210_fasttrack_outputs.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
fmriprep
2+
fmriprep/.bidsignore
23
fmriprep/dataset_description.json
34
fmriprep/logs
45
fmriprep/logs/CITATION.bib
@@ -7,8 +8,8 @@ fmriprep/logs/CITATION.md
78
fmriprep/logs/CITATION.tex
89
fmriprep/sub-02
910
fmriprep/sub-02/func
10-
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-1_desc-confounds_regressors.json
11-
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-1_desc-confounds_regressors.tsv
11+
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-1_desc-confounds_timeseries.json
12+
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-1_desc-confounds_timeseries.tsv
1213
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-1_from-scanner_to-T1w_mode-image_xfm.txt
1314
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-1_from-T1w_to-scanner_mode-image_xfm.txt
1415
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-1_space-MNI152NLin2009cAsym_boldref.nii.gz

.circleci/ds210_outputs.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
fmriprep
2+
fmriprep/.bidsignore
23
fmriprep/dataset_description.json
34
fmriprep/logs
45
fmriprep/logs/CITATION.bib
@@ -26,8 +27,8 @@ fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz
2627
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz
2728
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz
2829
fmriprep/sub-02/func
29-
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-1_desc-confounds_regressors.json
30-
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-1_desc-confounds_regressors.tsv
30+
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-1_desc-confounds_timeseries.json
31+
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-1_desc-confounds_timeseries.tsv
3132
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-1_from-scanner_to-T1w_mode-image_xfm.txt
3233
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-1_from-T1w_to-scanner_mode-image_xfm.txt
3334
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-1_space-MNI152NLin2009cAsym_boldref.nii.gz

docs/outputs.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ Confounds_ are saved as a :abbr:`TSV (tab-separated value)` file::
177177

178178
sub-<subject_label>/
179179
func/
180-
sub-<subject_label>_[specifiers]_desc-confounds_regressors.tsv
181-
sub-<subject_label>_[specifiers]_desc-confounds_regressors.json
180+
sub-<subject_label>_[specifiers]_desc-confounds_timeseries.tsv
181+
sub-<subject_label>_[specifiers]_desc-confounds_timeseries.json
182182

183183
These :abbr:`TSV (tab-separated values)` tables look like the example below,
184184
where each row of the file corresponds to one time point found in the
@@ -233,7 +233,7 @@ session and run in :abbr:`TSV (tab-separated value)` files - one column for each
233233
Such tabular files may include over 100 columns of potential confound regressors.
234234

235235
.. danger::
236-
Do not include all columns of ``~_desc-confounds_regressors.tsv`` table
236+
Do not include all columns of ``~_desc-confounds_timeseries.tsv`` table
237237
into your design matrix or denoising procedure.
238238
Filter the table first, to include only the confounds (or components thereof)
239239
you want to remove from your fMRI signal.
@@ -386,7 +386,7 @@ For CompCor decompositions, entries include:
386386
- ``VarianceExplained``: the fraction of variance explained by the component across the decomposition ROI mask.
387387
- ``CumulativeVarianceExplained``: the total fraction of variance explained by this particular component
388388
and all preceding components.
389-
- ``Retained``: Indicates whether the component was saved in ``desc-confounds_regressors.tsv``
389+
- ``Retained``: Indicates whether the component was saved in ``desc-confounds_timeseries.tsv``
390390
for use in denoising.
391391
Entries that are not saved in the data file for denoising are still stored in metadata with the
392392
``dropped`` prefix.

fmriprep/utils/bids.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def write_bidsignore(deriv_dir):
1414
"*.surf.gii", # Unspecified structural outputs
1515
# Unspecified functional outputs
1616
"*_boldref.nii.gz", "*_bold.func.gii",
17-
"*_mixing.tsv", "*_AROMAnoiseICs.csv", "*_regressors.tsv",
17+
"*_mixing.tsv", "*_AROMAnoiseICs.csv", "*_timeseries.tsv",
1818
)
1919
ignore_file = Path(deriv_dir) / ".bidsignore"
2020

0 commit comments

Comments
 (0)