From ff776c429934f5a98e321a98a669de39c7a12291 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=C3=A1n=20Mu=C3=B1oz?= <amuoz@ed.ac.uk>
Date: Wed, 11 Aug 2021 18:23:24 +0100
Subject: [PATCH] bugfixes
Former-commit-id: cc13d135e2dd3e3f8594f4a476a6f4604a49d468
---
core/processes/dsignal.py | 4 ++--
core/processor.py | 14 ++++++++------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/core/processes/dsignal.py b/core/processes/dsignal.py
index 56ac8f03..c5960757 100644
--- a/core/processes/dsignal.py
+++ b/core/processes/dsignal.py
@@ -9,8 +9,8 @@ class dsignalParameters(ParametersABC):
:window: Number of timepoints to consider for signal.
"""
- def __init__(self, window):
- super().__init__()
+ def __init__(self, window: int):
+ self.window = window
@classmethod
def default(cls):
diff --git a/core/processor.py b/core/processor.py
index 7fad4e69..38120394 100644
--- a/core/processor.py
+++ b/core/processor.py
@@ -76,7 +76,7 @@ class PostProcessor:
}
self.process_parameters = {
process: self.get_parameters(process)
- for process in parameters["process_parameters"].keys()
+ for process in parameters["processes"]["processes"]
}
self.processes = parameters["processes"]
@@ -106,13 +106,15 @@ class PostProcessor:
self._writer.write(ids, "/postprocessing/cell_info/" + name)
picks = self.picker.run(self._signal[self.processes["picker"][0]])
for process, datasets in self.processes["processes"].items():
- if process in self.parameters.to_dict():
- loaded_process = self.process_classfun[process](
+ parameters = (
+ self.process_parameters[process].from_dict(
self.process_parameters[process]
)
- else:
- print(self.process_classfun, process)
- loaded_process = self.process_classfun[process].default()
+ if process in self.parameters["processes"]["process_parameters"]
+ else self.process_parameters[process].default()
+ )
+ print(parameters.to_dict())
+ loaded_process = self.process_classfun[process](parameters)
for dataset in datasets:
if isinstance(dataset, list): # multisignal process
dataset = [self._signal[d] for d in dataset]
--
GitLab