From f2efb3fb76396277843bb574bc08ddbdfb46f9e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=C3=A1n=20Mu=C3=B1oz?= <amuoz@ed.ac.uk>
Date: Fri, 20 Aug 2021 18:52:54 +0100
Subject: [PATCH] bugfix
Former-commit-id: df390a601cab1815628cde45c21929a2b120ff65
---
core/processor.py | 34 +++++++++++++++++++---------------
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/core/processor.py b/core/processor.py
index c590ccd8..516f4c1e 100644
--- a/core/processor.py
+++ b/core/processor.py
@@ -74,15 +74,16 @@ class PostProcessor:
# self.outpaths = parameters["outpaths"]
self.merger = merger(parameters["parameters"]["prepost"]["merger"])
+
self.picker = picker(
parameters=parameters["parameters"]["prepost"]["picker"],
cells=Cells.from_source(filename),
)
self.classfun = {
process: self.get_process(process)
- for process in parameters["targets"]["processes"].keys()
+ for process in parameters["targets"]["processes"]
}
- self.parameters = {
+ self.parameters_classfun = {
process: self.get_parameters(process)
for process in parameters["targets"]["processes"]
}
@@ -115,24 +116,27 @@ class PostProcessor:
changes_history = prev_idchanges + [merge_events] # + [picks]
self._writer.write("/id_changes", data=changes_history)
- self._writer.write(
- "/postprocessing/merge_events/",
- data=merge_events,
- meta={"source": "/cell_info/"},
- )
- changes_history += picks
- picks = self.picker.run(self._signal[self.targets["prepost"]["picker"][0]])
+ # self._writer.write(
+ # "/postprocessing/merge_events/",
+ # data=merge_events,
+ # meta={"source": "/cell_info/"},
+ # )
+ # changes_history += picks
+ # picks = self.picker.run(self._signal[self.targets["prepost"]["picker"][0]])
# self._writer.write()
def run(self):
self.run_prepost()
- for process, datasets in self.processes["processes"].items():
- parameters = (
- self.parameters[process].from_dict(self.parameters[process])
- if process in self.parameters["processes"]["parameters"]
- else self.parameters[process].default()
- )
+ for process, datasets in self.targets["processes"].items():
+ if process in self.parameters["parameters"].get(
+ "processes", {}
+ ): # If we assigned parameters
+ parameters = self.parameters_classfun[process](self.parameters[process])
+
+ else:
+ parameters = self.parameters_classfun[process].default()
+
loaded_process = self.classfun[process](parameters)
for dataset in datasets:
if isinstance(dataset, list): # multisignal process
--
GitLab