fix: multiverse options

Author: mgxd

nibabies/cli/parser.py

@@ -843,23 +843,29 @@ def parse_args(args=None, namespace=None):
     version = config.environment.version
     output_layout = config.execution.output_layout
     config.execution._config_hash = config.hash_config(config.get())
-    if output_layout == 'multiverse':
-        output_dir += f'-{version.split("+", 1)[0]}-{config.execution.config_hash}'
 
     if config.execution.fs_subjects_dir is None:
-        if output_layout == 'bids':
+        if output_layout in ('bids', 'multiverse'):
             config.execution.fs_subjects_dir = output_dir / 'sourcedata' / 'freesurfer'
         elif output_layout == 'legacy':
             config.execution.fs_subjects_dir = output_dir / 'freesurfer'
 
     if config.execution.nibabies_dir is None:
-        if output_layout == 'bids':
+        if output_layout in 'bids':
             config.execution.nibabies_dir = output_dir
         elif output_layout == 'legacy':
             config.execution.nibabies_dir = output_dir / 'nibabies'
+        elif output_layout == 'multiverse':
+            config.loggers.cli.warning(
+                'Multiverse output selected - assigning output directory based on version'
+                ' and configuration hash.'
+            )
+            config.execution.nibabies_dir = (
+                output_dir / f'nibabies-{version.split("+", 1)[0]}-{config.execution._config_hash}'
+            )
 
     if config.workflow.surface_recon_method == 'mcribs':
-        if output_layout == 'bids':
+        if output_layout in ('bids', 'multiverse'):
             config.execution.mcribs_dir = output_dir / 'sourcedata' / 'mcribs'
         elif output_layout == 'legacy':
             config.execution.mcribs_dir = output_dir / 'mcribs'

nibabies/workflows/base.py

@@ -368,7 +368,6 @@ def init_single_subject_wf(
         )
 
     anat = reference_anat.lower()  # To be used for workflow connections
-
     LOGGER.info(
         'Collected the following data for %s:\nRaw:\n%s\n\nDerivatives:\n\n%s\n',
         f'sub-{subject_id}' if not session_id else f'sub-{subject_id}_ses-{session_id}',

nibabies/workflows/bold/outputs.py

@@ -32,7 +32,7 @@
 
 from nibabies import config
 from nibabies._types import Anatomical
-from nibabies.config import DEFAULT_DISMISS_ENTITIES, DEFAULT_MEMORY_MIN_GB, dismiss_echo
+from nibabies.config import DEFAULT_DISMISS_ENTITIES, DEFAULT_MEMORY_MIN_GB, dismiss_entities
 from nibabies.interfaces import DerivativesDataSink
 from nibabies.interfaces.bids import BIDSURI
 
@@ -487,7 +487,7 @@ def init_ds_registration_wf(
             mode='image',
             suffix='xfm',
             extension='.txt',
-            dismiss_entities=dismiss_echo(['part']),
+            dismiss_entities=dismiss_entities(['part']),
             **{'from': source, 'to': dest},
         ),
         name='ds_xform',