moving the addition of bold masking below and enabling previously blocked nodeblocks

Author: birajstha

CPAC/pipeline/cpac_pipeline.py

@@ -1291,13 +1291,6 @@ def build_workflow(subject_id, sub_dict, cfg, pipeline_name=None):
             mask_sbref,
         ]
 
-    # Template space functional mask
-    if cfg.functional_preproc["template_space_func_masking"]["run"]:
-        if not rpool.check_rpool("space-template_desc-bold_mask"):
-            pipeline_blocks += [
-                bold_mask_anatomical_resampled,
-            ]
-
         # Distortion/Susceptibility Correction
         distcor_blocks = []
         if "fmap" in sub_dict:
@@ -1320,6 +1313,14 @@ def build_workflow(subject_id, sub_dict, cfg, pipeline_name=None):
 
         pipeline_blocks += stack_motion_blocks(func_blocks, cfg, rpool)
 
+    
+    # Template space functional mask
+    if cfg.functional_preproc["template_space_func_masking"]["run"]:
+        if not rpool.check_rpool("space-template_desc-bold_mask"):
+            pipeline_blocks += [
+                bold_mask_anatomical_resampled,
+            ]
+            
     # BOLD to T1 coregistration
     if cfg.registration_workflows["functional_registration"]["coregistration"][
         "run"