Quick repair of phase difference field map ingress.

Author: sgiavasis

CPAC/utils/bids_utils.py

@@ -534,7 +534,6 @@ def bids_gen_cpac_sublist(bids_dir, paths_list, config_dict, creds_path,
                                               raise_error=raise_error)
 
     subdict = {}
-
     for p in paths_list:
         if bids_dir in p:
             str_list = p.split(bids_dir)
@@ -702,8 +701,8 @@ def collect_bids_files_configs(bids_dir, aws_input_creds=''):
     file_paths = []
     config_dict = {}
 
-    suffixes = ['T1w', 'T2w', 'bold', 'epi', 'phasediff', 'magnitude',
-                'magnitude1', 'magnitude2']
+    suffixes = ['T1w', 'T2w', 'bold', 'epi', 'phasediff', 'phase1',
+                'magnitude', 'magnitude1', 'magnitude2']
 
     if bids_dir.lower().startswith("s3://"):
         # s3 paths begin with s3://bucket/

CPAC/utils/datasource.py

@@ -505,7 +505,7 @@ def ingress_func_metadata(wf, cfg, rpool, sub_dict, subject_id,
 
             fmap_TE_list.append(f"{key}-TE")
 
-            if re.search('diff.*(phase|mag)', key):
+            if 'phase' in key or 'mag' in key:
                 diff = True
 
             if re.match('epi_[AP]{2}', orig_key):