Commit 992834cf authored by aknecht2's avatar aknecht2
Browse files

Removed print statement from workflow_module. Fixed multiple prefix passing.

parent 9135d7b2
......@@ -36,7 +36,6 @@ class WorkflowModule(object):
# Deep copy self.order, want to maintain it
self._add_workflow_keys(self.workflow, list(self.order))
self._load_jobs(self.data[self.name], add_markers = dict(self.markers))
pprint(self.workflow)
except SystemExit as se:
pass
return
......@@ -131,7 +130,7 @@ class WorkflowModule(object):
def get_files(self, markers, prefix = None, master_files = {}):
valid, msg = self._check_input_markers(markers)
if valid:
input_files, additional_files, output_files = self._load_required_files(self.data[self.name], markers, prefix = prefix, master_files = master_files)
input_files, additional_files, output_files = self._load_required_files(markers, prefix = prefix, master_files = master_files)
return valid, {
"inputs": input_files,
"additional_files": additional_files,
......@@ -153,7 +152,7 @@ class WorkflowModule(object):
valid = True
msg = ""
valid, msg, module_files = self._check_files(master_files, prefix, markers, input_files, additional_files)
self._traverse_jobs(self.data[self.name], dax, master_jobs, master_files, prefix, markers, input_files, additional_files)
self._traverse_jobs(dax, master_jobs, master_files, prefix, markers, input_files, additional_files)
return
def _setup_file_list(self, master_files, job_info, file_type, file_dict, prefix, markers):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment