From 670aa0fec0bc95159bda8d8bdcf4b165fc504c77 Mon Sep 17 00:00:00 2001 From: EliseCos Date: Tue, 13 Jan 2026 16:47:09 +0100 Subject: [PATCH 1/2] fix _filesin main.nf + update local tracking --- main.nf | 2 +- modules.json | 2 +- .../nf-neuro/tracking/localtracking/main.nf | 22 +++++++++++++++++-- .../nf-neuro/tracking/localtracking/meta.yml | 4 ++++ .../localtracking/tests/main.nf.test.snap | 8 +++---- .../localtracking/tests/nextflow_fa.config | 2 +- 6 files changed, 31 insertions(+), 9 deletions(-) diff --git a/main.nf b/main.nf index c486cbe..12a38c4 100644 --- a/main.nf +++ b/main.nf @@ -88,7 +88,7 @@ workflow { } } else { - ch_after_preqc = ch_dwi_bvalbvec.dwi + ch_after_preqc = ch_dwi_bvalbvec.dwi_files bvs_after_preqc = ch_dwi_bvalbvec.bvs } diff --git a/modules.json b/modules.json index fcbe6e0..76d7c2d 100644 --- a/modules.json +++ b/modules.json @@ -58,7 +58,7 @@ }, "tracking/localtracking": { "branch": "main", - "git_sha": "b21f41f92e1ee439300b7060fc0296b56c6511b9", + "git_sha": "ec4f04fd25e3167ba495094925027248722c1aad", "installed_by": ["modules"] }, "utils/extractb0": { diff --git a/modules/nf-neuro/tracking/localtracking/main.nf b/modules/nf-neuro/tracking/localtracking/main.nf index fe3d5ec..66058b8 100644 --- a/modules/nf-neuro/tracking/localtracking/main.nf +++ b/modules/nf-neuro/tracking/localtracking/main.nf @@ -31,6 +31,7 @@ process TRACKING_LOCALTRACKING { def local_seeding_mask = task.ext.local_seeding_mask_type ?: "wm" def local_step = task.ext.local_step ? "--step " + task.ext.local_step : "" + def local_step_pct = task.ext.local_step_pct ? task.ext.local_step_pct : "" def local_random_seed = task.ext.local_random_seed ? "--seed " + task.ext.local_random_seed : "" def local_seeding = task.ext.local_seeding ? "--" + task.ext.local_seeding : "" def local_nbr_seeds = task.ext.local_nbr_seeds ? "" + task.ext.local_nbr_seeds : "" @@ -47,11 +48,28 @@ process TRACKING_LOCALTRACKING { def run_qc = task.ext.run_qc ? task.ext.run_qc : false + if (local_step && local_step_pct) { + log.warn "Both local_step and local_step_pct are set for ${meta.id}. local_step will take priority and local_step_pct will be ignored." + } + """ + # Set home directory. This is problematic if the container is run + # with non-root user which does not create a home directory. When + # running the local tracking using GPU, its trying to write to + # ~/.cache/ directory, causing the job to fail. + mkdir -p /tmp + export HOME=/tmp + export ITK_GLOBAL_DEFAULT_NUMBER_OF_THREADS=1 export OMP_NUM_THREADS=1 export OPENBLAS_NUM_THREADS=1 + local_step_size="$local_step" + if [[ -z "$local_step" ]] && [[ -n "$local_step_pct" ]]; then + pixdim=\$(scil_header_print_info $wm --keys pixdim | tr -d '[]' | awk '{for(i=2;i<=4;i++) if(\$i>0 && (\$i Date: Wed, 14 Jan 2026 09:15:19 +0100 Subject: [PATCH 2/2] fix ch_dwi_bvalbvec --- main.nf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.nf b/main.nf index 47ab44a..794cb3b 100644 --- a/main.nf +++ b/main.nf @@ -93,8 +93,8 @@ workflow { } } else { - ch_after_preqc = ch_dwi_bvalbvec.dwi_files - bvs_after_preqc = ch_dwi_bvalbvec.bvs + ch_after_preqc = ch_dwi_bvalbvec.dwi + bvs_after_preqc = ch_dwi_bvalbvec.bvs_files } if (params.run_denoising){