From 0265d006e21b4ff3194e9db30ef3e965c23289a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=C3=A1n=20Mu=C3=B1oz?= <alan.munoz@ed.ac.uk>
Date: Wed, 15 Mar 2023 12:00:09 +0000
Subject: [PATCH] change(post): capitalise Processes in orchestrator
---
src/postprocessor/core/processor.py | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/postprocessor/core/processor.py b/src/postprocessor/core/processor.py
index fc85649f..add96630 100644
--- a/src/postprocessor/core/processor.py
+++ b/src/postprocessor/core/processor.py
@@ -12,8 +12,8 @@ from agora.io.signal import Signal
from agora.io.writer import Writer
from postprocessor.core.abc import get_parameters, get_process
from postprocessor.core.lineageprocess import LineageProcessParameters
-from postprocessor.core.reshapers.merger import merger, mergerParameters
-from postprocessor.core.reshapers.picker import picker, pickerParameters
+from postprocessor.core.reshapers.merger import Merger, MergerParameters
+from postprocessor.core.reshapers.picker import Picker, PickerParameters
class PostProcessorParameters(ParametersABC):
@@ -77,8 +77,8 @@ class PostProcessorParameters(ParametersABC):
}
param_sets = {
"prepost": {
- "merger": mergerParameters.default(),
- "picker": pickerParameters.default(),
+ "merger": MergerParameters.default(),
+ "picker": PickerParameters.default(),
}
}
outpaths = {}
@@ -125,12 +125,12 @@ class PostProcessor(ProcessABC):
if not isinstance(dicted_params[k], dict):
dicted_params[k] = dicted_params[k].to_dict()
- self.merger = merger(
- mergerParameters.from_dict(dicted_params["merger"])
+ self.merger = Merger(
+ MergerParameters.from_dict(dicted_params["merger"])
)
- self.picker = picker(
- pickerParameters.from_dict(dicted_params["picker"]),
+ self.picker = Picker(
+ PickerParameters.from_dict(dicted_params["picker"]),
cells=Cells.from_source(filename),
)
self.classfun = {
@@ -356,9 +356,3 @@ class PostProcessor(ProcessABC):
metadata: Dict,
):
self._writer.write(path, result, meta=metadata, overwrite="overwrite")
-
-
-def _if_dict(item):
- if hasattr(item, "to_dict"):
- item = item.to_dict()
- return item
--
GitLab