Commit dd4fe891 authored by aknecht2's avatar aknecht2

Adjusted validator to handle raw-file roi input.

parent 311e85bc
......@@ -401,6 +401,10 @@ class ImageProcessor(Workflow):
if not self.err:
for type in self.workflow.data["extract"]["workflows"]:
if type in self.workflow.data["workflows"]:
if "--dimfromroi" in self.workflow["extract"]["workflows"][type]["arguments"]:
fpath = self.workflow["extract"]["workflows"][type]["arguments"]["--dimfromroi"]
if os.path.isfile(fpath):
self.workflow.rawFiles[type].append(fpath)
job = self.workflow.data["extract"]["workflows"][type]
job["executable"] = "ih-extract"
job["outputs"] = ["none"]
......
......@@ -663,6 +663,7 @@ class ImageProcessor(Workflow):
if "--dimfromroi" in self.workflow["extract"]["workflows"][type]["arguments"]:
if os.path.isfile(self.workflow["extract"]["workflows"][type]["arguments"]["--dimfromroi"]):
roiFile = self.workflow["extract"]["workflows"][type]["arguments"]["--dimfromroi"]
self._addFile("img.db", "raw", "input", self.basepath + "/output/output.db")
else:
roiFile = derivedPath + "_" + self.workflow["extract"]["workflows"][type]["arguments"]["--dimfromroi"] + ".json"
exInput[type][clusternum[type]][roiFile] = {"file": roiFile, "transfer": save}
......
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