Skip to content

Commit 25d1bbd

Browse files
authored
🐛 Restore outputs removed from "freesurfer_abcd_preproc" to "freesurfer_reconall" (#2192)
2 parents 9ddd96a + de9f530 commit 25d1bbd

File tree

2 files changed

+23
-2
lines changed

2 files changed

+23
-2
lines changed

.github/workflows/smoke_test_participant.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,10 @@ jobs:
145145
echo DOCKER_TAG=$(echo "ghcr.io/${{ github.repository }}" | tr '[:upper:]' '[:lower:]'):$TAG >> $GITHUB_ENV
146146
cat $GITHUB_ENV
147147
- name: setup-conda
148-
uses: s-weigand/setup-[email protected]
148+
uses: conda-incubator/setup-[email protected]
149149
- name: Set up datalad-OSF
150150
run: |
151+
sudo apt-get update && sudo apt-get install -y git-annex
151152
git config --global user.email "[email protected]"
152153
git config --global user.name "Theodore (Machine User)"
153154
yes | conda install -c conda-forge datalad
@@ -203,15 +204,23 @@ jobs:
203204
echo DOCKER_TAG=$(echo "ghcr.io/${{ github.repository }}" | tr '[:upper:]' '[:lower:]'):$TAG >> $GITHUB_ENV
204205
cat $GITHUB_ENV
205206
- name: setup-conda
206-
uses: s-weigand/[email protected]
207+
uses: conda-incubator/[email protected]
208+
with:
209+
activate-environment: datalad-osf
210+
channels: conda-forge
211+
conda-remove-defaults: "true"
212+
python-version: 3.12
207213
- name: Set up datalad-OSF
208214
run: |
215+
sudo apt-get update && sudo apt-get install -y git-annex
209216
git config --global user.email "[email protected]"
210217
git config --global user.name "Theodore (Machine User)"
211218
yes | conda install -c conda-forge datalad
212219
pip install datalad-osf
213220
- name: Get rodent test data
214221
run: |
222+
export GIT_TRACE=1
223+
export DATALAD_LOG_LEVEL=DEBUG
215224
datalad clone osf://uya3r test-data
216225
- name: Run rodent smoke test
217226
run: |

CPAC/anat_preproc/anat_preproc.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2904,6 +2904,18 @@ def freesurfer_abcd_preproc(wf, cfg, strat_pool, pipe_num, opt=None):
29042904
"pipeline-fs_brainmask",
29052905
"pipeline-fs_wmparc",
29062906
"pipeline-fs_T1",
2907+
*[
2908+
f"pipeline-fs_hemi-{hemi}_{entity}"
2909+
for hemi in ["L", "R"]
2910+
for entity in [
2911+
"desc-surface_curv",
2912+
*[
2913+
f"desc-surfaceMesh_{_}"
2914+
for _ in ["pial", "smoothwm", "sphere", "white"]
2915+
],
2916+
*[f"desc-surfaceMap_{_}" for _ in ["sulc", "thickness", "volume"]],
2917+
]
2918+
],
29072919
*freesurfer_abcd_preproc.outputs,
29082920
# we're grabbing the postproc outputs and appending them to
29092921
# the reconall outputs

0 commit comments

Comments
 (0)