Merge branch 'master' of https://github.com/Washington-University/HCP…

…pipelinesXnatPbsJobs
Washington-University · May 15, 2020 · 64a2453 · 64a2453
2 parents c85012b + 02f35de
commit 64a2453
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # HCPpipelinesXnatPbsUtils
 Utilities for:
 
@@ -10,7 +9,3 @@ Utilities for:
 * etc
 
 Much of the work is done via submitting jobs to a PBS job scheduler
-=======
-# xnat_pbs_jobs
-Scripts to run HCP Pipelines as XNAT aware PBS scheduled jobs
->>>>>>> 91bb8e4b46da63cfcac4c0cc9ad35ad38ccce211
diff --git a/lib/ccf/functional_preprocessing/SubmitFunctionalPreprocessingBatch.py b/lib/ccf/functional_preprocessing/SubmitFunctionalPreprocessingBatch.py
@@ -140,8 +140,8 @@ def do_submissions(userid, password, subject_list):
 		subject_list.append(subject_info)
 	else:
 		# Otherwise, pull from file
-		print("Retrieving subject list from: " + subject_file_name)
 		subject_file_name = file_utils.get_subjects_file_name(__file__)
+		print("Retrieving subject list from: " + subject_file_name)
 		subject_list = ccf_subject.read_subject_info_list(subject_file_name, separator=":")
 
 	do_submissions(userid, password, subject_list)