Merge pull request #355 from khanlab/fix-hippb500

bugfix for hippb500 workflow
khanlab · Jan 22, 2025 · ccf2b76 · ccf2b76
2 parents ceaaea3 + bbd4f64
commit ccf2b76
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/hippunfold/workflow/rules/common.smk b/hippunfold/workflow/rules/common.smk
@@ -272,6 +272,8 @@ def get_final_output():
 
 if "corobl" in ref_spaces:
 
+    ruleorder: equivolume_coords > laplace_coords_hipp > laplace_coords_dentate > copy_coords_to_results
+
     rule copy_coords_to_results:
         input:
             os.path.join(work, "{pre}_space-corobl_{post}{suffix}.{ext}"),
@@ -284,7 +286,7 @@ if "corobl" in ref_spaces:
 
     rule copy_xfm_to_results:
         input:
-            os.path.join(work, "{pre}_{fromto,from|to}-corobl_{post}{suffix}.{ext}"),
+            os.path.join(work, "{pre}_{fromto}-corobl_{post}{suffix}.{ext}"),
         output:
             os.path.join(
                 root, "{pre,[^/].+}_{fromto,from|to}-corobl_{post}{suffix,xfm}.{ext}"

diff --git a/hippunfold/workflow/rules/gifti.smk b/hippunfold/workflow/rules/gifti.smk
@@ -187,7 +187,7 @@ rule affine_gii_to_native:
             datatype="surf",
             den="{density}",
             suffix="{surfname}.surf.gii",
-            space="{native_modality}",
+            space="{native_modality,T1w|T2w}",
             hemi="{hemi}",
             label="{autotop,hipp|dentate}",
             **inputs.subj_wildcards

diff --git a/hippunfold/workflow/rules/native_surf.smk b/hippunfold/workflow/rules/native_surf.smk
@@ -752,7 +752,7 @@ rule affine_gii_corobl_to_modality:
             root=root,
             datatype="surf",
             suffix="{surfname}.surf.gii",
-            space="{native_modality}",
+            space="{native_modality,T1w|T2w}",
             hemi="{hemi}",
             label="{autotop,hipp|dentate}",
             **inputs.subj_wildcards