Merge remote-tracking branch 'origin/main'

courtois-neuromod · Jan 9, 2025 · e082816 · e082816
2 parents 307b7a1 + 3a7f0c9
commit e082816
Show file tree

Hide file tree

Showing 23 changed files with 8 additions and 1,472 deletions.
diff --git a/.gitignore b/.gitignore
@@ -99,17 +99,6 @@ THINGS/fmriprep/sourcedata/things/stimuli/images_fmri/*
 # raw QC notes w identifiers
 THINGS/fmriprep/sourcedata/things/code/cleanup/raw_qc_notes.md
 
-# fLoc files
-fLoc/rois/sub-0*/glm/sub-*
-fLoc/fmriprep/sourcedata/floc/sub-0*/ses-0*/func/sub-0*_ses-0*_task-fLoc_run-0*events.tsv
-fLoc/rois/standard_masks/standard_rois/*nii
-fLoc/rois/standard_masks/kanwisher_parcels/*
-fLoc/rois/sub-*/rois/from_atlas/sub-0*
-fLoc/rois/sub-*/rois/task-derived/sub-0*
-
-# pycortex files
-anatomical/pycortex/db/*
-
 # output figures
 datapaper/figures/*.png
 datapaper/figures/*.jpg

diff --git a/.gitmodules b/.gitmodules
@@ -33,3 +33,8 @@
 	url = [email protected]:courtois-neuromod/things.glmsingle.git
 	datalad-id = 48db661d-fcef-44ba-a2bc-4bb04f8fd3d5
 	datalad-url = [email protected]:courtois-neuromod/things.glmsingle.git
+[submodule "fLoc/rois"]
+	path = fLoc/rois
+	url = [email protected]:courtois-neuromod/floc.rois.git
+	datalad-id = 64b59aaf-4a0b-47c8-867e-fb47ecf01988
+	datalad-url = [email protected]:courtois-neuromod/floc.rois.git
diff --git a/README.md b/README.md
@@ -324,5 +324,3 @@ Project Organization
         └── report         <- Data paper manuscript     <- TODO
 
 --------
-
-<p><small>Project based on the <a target="_blank" href="https://drivendata.github.io/cookiecutter-data-science/">cookiecutter data science project template</a>. #cookiecutterdatascience</small></p>
diff --git a/THINGS/glmsingle b/THINGS/glmsingle
diff --git a/fLoc/fmriprep b/fLoc/fmriprep
diff --git a/fLoc/rois b/fLoc/rois
diff --git a/fLoc/rois/code/README.md b/fLoc/rois/code/README.md
diff --git a/fLoc/rois/code/fLoc_firstLevel_nilearn.py b/fLoc/rois/code/fLoc_firstLevel_nilearn.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -324,5 +324,3 @@ Project Organization
		└── report <- Data paper manuscript <- TODO

		--------

		<p><small>Project based on the <a target="_blank" href="https://drivendata.github.io/cookiecutter-data-science/">cookiecutter data science project template</a>. #cookiecutterdatascience</small></p>
+0 −1,694		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_desc-confounds_part-mag_timeseries.json
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_desc-confounds_part-mag_timeseries.tsv
+0 −5		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_from-T1w_to-scanner_mode-image_part-mag_xfm.txt
+0 −5		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_from-scanner_to-T1w_mode-image_part-mag_xfm.txt
+0 −1		...2/ses-002/func/sub-02_ses-002_task-fLoc_run-1_space-MNI152NLin2009cAsym_desc-aparcaseg_part-mag_dseg.nii.gz
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_space-MNI152NLin2009cAsym_desc-aseg_part-mag_dseg.nii.gz
+0 −5		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_space-MNI152NLin2009cAsym_desc-brain_part-mag_mask.json
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_space-MNI152NLin2009cAsym_desc-brain_part-mag_mask.nii.gz
+0 −7		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_space-MNI152NLin2009cAsym_desc-preproc_part-mag_bold.json
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_space-MNI152NLin2009cAsym_desc-preproc_part-mag_bold.nii.gz
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_space-MNI152NLin2009cAsym_part-mag_boldref.nii.gz
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_space-T1w_desc-aparcaseg_part-mag_dseg.nii.gz
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_space-T1w_desc-aseg_part-mag_dseg.nii.gz
+0 −5		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_space-T1w_desc-brain_part-mag_mask.json
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_space-T1w_desc-brain_part-mag_mask.nii.gz
+0 −7		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_space-T1w_desc-preproc_part-mag_bold.json
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_space-T1w_desc-preproc_part-mag_bold.nii.gz
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_space-T1w_part-mag_boldref.nii.gz
+0 −7		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_space-fsLR_den-91k_part-mag_bold.dtseries.json
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_space-fsLR_den-91k_part-mag_bold.dtseries.nii
+0 −6		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-1_space-fsLR_den-91k_part-mag_bold.json
+0 −3,758		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_desc-confounds_part-mag_timeseries.json
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_desc-confounds_part-mag_timeseries.tsv
+0 −5		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_from-T1w_to-scanner_mode-image_part-mag_xfm.txt
+0 −5		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_from-scanner_to-T1w_mode-image_part-mag_xfm.txt
+0 −1		...2/ses-002/func/sub-02_ses-002_task-fLoc_run-2_space-MNI152NLin2009cAsym_desc-aparcaseg_part-mag_dseg.nii.gz
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_space-MNI152NLin2009cAsym_desc-aseg_part-mag_dseg.nii.gz
+0 −5		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_space-MNI152NLin2009cAsym_desc-brain_part-mag_mask.json
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_space-MNI152NLin2009cAsym_desc-brain_part-mag_mask.nii.gz
+0 −7		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_space-MNI152NLin2009cAsym_desc-preproc_part-mag_bold.json
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_space-MNI152NLin2009cAsym_desc-preproc_part-mag_bold.nii.gz
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_space-MNI152NLin2009cAsym_part-mag_boldref.nii.gz
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_space-T1w_desc-aparcaseg_part-mag_dseg.nii.gz
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_space-T1w_desc-aseg_part-mag_dseg.nii.gz
+0 −5		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_space-T1w_desc-brain_part-mag_mask.json
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_space-T1w_desc-brain_part-mag_mask.nii.gz
+0 −7		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_space-T1w_desc-preproc_part-mag_bold.json
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_space-T1w_desc-preproc_part-mag_bold.nii.gz
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_space-T1w_part-mag_boldref.nii.gz
+0 −7		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_space-fsLR_den-91k_part-mag_bold.dtseries.json
+0 −1		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_space-fsLR_den-91k_part-mag_bold.dtseries.nii
+0 −6		sub-02/ses-002/func/sub-02_ses-002_task-fLoc_run-2_space-fsLR_den-91k_part-mag_bold.json