Commit 3b08aa01 authored by aknecht2's avatar aknecht2

Updated validator for missing args. Updated workflow for extract clustering.

parent 17f15851
......@@ -166,7 +166,7 @@ class Workflow(object):
def _validateArgumentRequired(self, job, arg, type):
if "required" in conf.valid[job["executable"]]["arguments"][arg]:
if arg in job["arguments"]:
if not job["arguments"][arg]:
if job["arguments"][arg] == "":
self.err += "Workflow, Argument Error: Type '%s' job '%s', has empty required argument '%s' \n" % (type, job["name"], arg)
else:
self.err += "Workflow, Argument Error: Type '%s' job '%s', requires argument '%s', no such argument found. \n" % (type, job["name"], arg)
......
......@@ -638,6 +638,7 @@ class ImageProcessor(Workflow):
exDep[type] = [[]]
exInput[type] = [{}]
jobnum = -1
skipFirst = True
clusternum[type] = 0
meancluster[type] = 0
excluster[type] = 0
......@@ -650,10 +651,11 @@ class ImageProcessor(Workflow):
clusternum[type] += 1
if ((clusternum[type] * 100 + jobnum) % int(self.config["cluster"] * 0.3)) == 0:
meancluster[type] += 1
if (jobnum % 50) == 0:
if (jobnum % 50) == 0 and not skipFirst:
exDep[type].append([])
exInput[type].append({})
excluster[type] += 1
skipFirst = False
extension = "." + infile.split(".")[1]
realname = self.files[self.dax][type]["input"][infile]["path"].split("/")[-1].split(".")[0]
derivedPath = self.files[self.dax][type]["input"][infile]["derivedPath"]
......
Markdown is supported
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