From b2e9140568d066643a45cbc5c61c4341abf5f2dc Mon Sep 17 00:00:00 2001 From: Taylor Salo Date: Wed, 28 Aug 2024 12:39:23 -0400 Subject: [PATCH] fix. --- src/fmripost_aroma/cli/run.py | 13 +++---------- src/fmripost_aroma/workflows/base.py | 10 ++-------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/fmripost_aroma/cli/run.py b/src/fmripost_aroma/cli/run.py index cab8652..b5bbfa5 100644 --- a/src/fmripost_aroma/cli/run.py +++ b/src/fmripost_aroma/cli/run.py @@ -152,10 +152,7 @@ def main(): from fmripost_aroma.utils.telemetry import process_crashfile crashfolders = [ - config.execution.output_dir - / f'sub-{s}' - / 'log' - / config.execution.run_uuid + config.execution.output_dir / f'sub-{s}' / 'log' / config.execution.run_uuid for s in config.execution.participant_label ] for crashfolder in crashfolders: @@ -199,9 +196,7 @@ def main(): dseg_tsv = str(api.get('fsaverage', suffix='dseg', extension=['.tsv'])) _copy_any(dseg_tsv, str(config.execution.output_dir / 'desc-aseg_dseg.tsv')) - _copy_any( - dseg_tsv, str(config.execution.output_dir / 'desc-aparcaseg_dseg.tsv') - ) + _copy_any(dseg_tsv, str(config.execution.output_dir / 'desc-aparcaseg_dseg.tsv')) errno = 0 finally: # Code Carbon @@ -219,9 +214,7 @@ def main(): output_dir=config.execution.output_dir, run_uuid=config.execution.run_uuid, ) - write_derivative_description( - config.execution.bids_dir, config.execution.output_dir - ) + write_derivative_description(config.execution.bids_dir, config.execution.output_dir) write_bidsignore(config.execution.output_dir) if sentry_sdk is not None and failed_reports: diff --git a/src/fmripost_aroma/workflows/base.py b/src/fmripost_aroma/workflows/base.py index ee2f202..2ef7825 100644 --- a/src/fmripost_aroma/workflows/base.py +++ b/src/fmripost_aroma/workflows/base.py @@ -72,10 +72,7 @@ def init_fmripost_aroma_wf(): single_subject_wf = init_single_subject_wf(subject_id) single_subject_wf.config['execution']['crashdump_dir'] = str( - config.execution.output_dir - / f'sub-{subject_id}' - / 'log' - / config.execution.run_uuid + config.execution.output_dir / f'sub-{subject_id}' / 'log' / config.execution.run_uuid ) for node in single_subject_wf._get_all_nodes(): node.config = deepcopy(single_subject_wf.config) @@ -84,10 +81,7 @@ def init_fmripost_aroma_wf(): # Dump a copy of the config file into the log directory log_dir = ( - config.execution.output_dir - / f'sub-{subject_id}' - / 'log' - / config.execution.run_uuid + config.execution.output_dir / f'sub-{subject_id}' / 'log' / config.execution.run_uuid ) log_dir.mkdir(exist_ok=True, parents=True) config.to_filename(log_dir / 'fmripost_aroma.toml')