Fixed an issue with the source_outputs_dir check.

FCP-INDI · Jan 28, 2021 · 0583f19 · 0583f19
1 parent 58a922a
commit 0583f19
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/CPAC/pipeline/engine.py b/CPAC/pipeline/engine.py
@@ -1232,14 +1232,19 @@ def initiate_rpool(wf, cfg, data_paths):
 
     # grab already-processed data from the output directory
     if cfg.pipeline_setup['output_directory']['pull_source_once']:
-        if not os.listdir(cfg.pipeline_setup['output_directory']['path']):
-            if cfg.pipeline_setup['output_directory']['source_outputs_dir']:
-                out_dir = cfg.pipeline_setup['output_directory'][
-                    'source_outputs_dir']
+        if os.path.isdir(cfg.pipeline_setup['output_directory']['path']):
+            if not os.listdir(cfg.pipeline_setup['output_directory']['path']):
+                if cfg.pipeline_setup['output_directory']['source_outputs_dir']:
+                    out_dir = cfg.pipeline_setup['output_directory'][
+                        'source_outputs_dir']
+                else:
+                    out_dir = cfg.pipeline_setup['output_directory']['path']
             else:
                 out_dir = cfg.pipeline_setup['output_directory']['path']
         else:
-            out_dir = cfg.pipeline_setup['output_directory']['path']
+            if cfg.pipeline_setup['output_directory']['source_outputs_dir']:
+                out_dir = cfg.pipeline_setup['output_directory'][
+                    'source_outputs_dir']
     else:
         if cfg.pipeline_setup['output_directory']['source_outputs_dir']:
             out_dir = cfg.pipeline_setup['output_directory']['source_outputs_dir']

diff --git a/dev/docker_data/default_pipeline.yml b/dev/docker_data/default_pipeline.yml
@@ -1333,8 +1333,6 @@ voxel_mirrored_homotopic_connectivity:
 network_centrality:
 
   # Calculate Degree, Eigenvector Centrality, or Functional Connectivity Density.
-  # this is a fork point
-  #   run: [On, Off] - this will run both and fork the pipeline
   run: [On]
 
   # Maximum amount of RAM (in GB) to be used when calculating Degree Centrality.