🐛 Only ingress functional if functional exists

Author: shnizzedy

CPAC/pipeline/engine.py

@@ -1913,10 +1913,10 @@ def initiate_rpool(wf, cfg, data_paths=None, part_id=None):
     if data_paths:
         rpool = ingress_raw_anat_data(wf, rpool, cfg, data_paths, unique_id,
                                       part_id, ses_id)
-
-        wf, rpool, diff, blip, fmap_rp_list = \
-            ingress_raw_func_data(wf, rpool, cfg, data_paths, unique_id,
-                                  part_id, ses_id)
+        if 'func' in data_paths:
+            wf, rpool, diff, blip, fmap_rp_list = \
+                ingress_raw_func_data(wf, rpool, cfg, data_paths, unique_id,
+                                      part_id, ses_id)
 
     # grab already-processed data from the output directory
     rpool = ingress_output_dir(cfg, rpool, unique_id, creds_path)

CPAC/pipeline/test/test_engine.py

@@ -28,10 +28,10 @@ def test_ingress_func_raw_data(pipe_config, bids_dir, test_dir):
 
     rpool = ResourcePool(name=unique_id, cfg=cfg)
 
-    wf, rpool, diff, blip, fmap_rp_list = ingress_raw_func_data(wf, rpool, cfg,
-                                                                sub_data_dct,
-                                                                unique_id,
-                                                                part_id, ses_id)
+    if 'func' in sub_data_dct:
+        wf, rpool, diff, blip, fmap_rp_list = \
+            ingress_raw_func_data(wf, rpool, cfg, sub_data_dct, unique_id,
+                                  part_id, ses_id)
 
     rpool.gather_pipes(wf, cfg, all=True)