From 056daaa9c3bc03fb218c6a9ac61ae1d38903a9c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=C3=A1n=20Mu=C3=B1oz?= <alan.munoz@ed.ac.uk>
Date: Wed, 28 Sep 2022 00:48:29 +0100
Subject: [PATCH] refactor(post): use signal.lineage
---
src/postprocessor/core/processor.py | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/postprocessor/core/processor.py b/src/postprocessor/core/processor.py
index 5f28dbba..915139db 100644
--- a/src/postprocessor/core/processor.py
+++ b/src/postprocessor/core/processor.py
@@ -310,23 +310,15 @@ class PostProcessor(ProcessABC):
parameters = self.parameters_classfun[process].default()
if isinstance(parameters, LineageProcessParameters):
- with h5py.File(self._filename, "r") as f:
- trap_mo_da = f[parameters.lineage_location]
- lineage = np.array(
- (
- trap_mo_da["trap"],
- trap_mo_da["mother_label"],
- trap_mo_da["daughter_label"],
- )
- ).T
+ lineage = self._signal.lineage(
+ # self.parameters.lineage_location
+ )
loaded_process = self.classfun[process](parameters)
loaded_process.load_lineage(lineage)
else:
loaded_process = self.classfun[process](parameters)
for dataset in datasets:
- # print("Processing", process, "for", dataset)
-
if isinstance(dataset, list): # multisignal process
signal = [self._signal[d] for d in dataset]
elif isinstance(dataset, str):
--
GitLab