From 5cf5cc393a6d3108c72389d6cd0419a19c853f64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=C3=A1n=20Mu=C3=B1oz?= <amuoz@ed.ac.uk>
Date: Mon, 14 Jun 2021 22:54:41 +0100
Subject: [PATCH] add signal support of df
Former-commit-id: 20ee0b1a98edff6604ec7535e926c67481707265
---
core/processor.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/core/processor.py b/core/processor.py
index 988e1ad1..0416f79c 100644
--- a/core/processor.py
+++ b/core/processor.py
@@ -1,3 +1,6 @@
+import pandas as pd
+
+
class Parameters:
def __init__(self, merger=None, picker=None, processes=None, branches=None):
self.merger = merger
@@ -49,15 +52,17 @@ class Signals:
return self._hdf[branch][()]
def branch_to_df(self, branch):
- dset = self._hdf[branch].values
+ dset = self._hdf[branch][()]
attrs = self._hdf[branch].attrs
first_branch = "/" + branch.split("/")[0] + "/"
- timepoints = self._hdf[first_branch].attrs["timepoints_processed"]
+ timepoints = self._hdf[first_branch].attrs["processed_timepoints"]
- if "cell_label" in self._hdf[branch]:
- ids = pd.MultiIndex.from_tuple(zip(attrs["trap"], attrs["cell_label"]))
+ if "cell_label" in self._hdf[branch].attrs:
+ ids = pd.MultiIndex.from_tuples(
+ zip(attrs["trap"], attrs["cell_label"]), names=["trap", "cell_label"]
+ )
else:
- ids = pd.Inde(attrs["trap"])
+ ids = pd.Index(attrs["trap"], names=["trap"])
return pd.DataFrame(dset, index=ids, columns=timepoints)
--
GitLab