From 8d5fb8b316d3396f2113545cb63caec9584866a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=C3=A1n=20Mu=C3=B1oz?= <amuoz@ed.ac.uk>
Date: Mon, 23 Aug 2021 15:20:19 +0100
Subject: [PATCH] bugfixes
Former-commit-id: 14c7b6bdfe4a278930f9a58d6345f08af17c18ad
---
core/functions/tracks.py | 8 ++++----
core/processor.py | 5 +++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/core/functions/tracks.py b/core/functions/tracks.py
index 76920de4..b1c06b70 100644
--- a/core/functions/tracks.py
+++ b/core/functions/tracks.py
@@ -229,13 +229,13 @@ def get_joinable(tracks, smooth=False, tol=0.1, window=5, degree=3) -> dict:
savgol_on_srs = lambda x: non_uniform_savgol(x.index, x.values, window, degree)
contig = clean.groupby(["trap"]).apply(get_contiguous_pairs)
contig = contig.loc[contig.apply(len) > 0]
- linear = set([k for v in contig.values for i in v for j in i for k in j])
- smoothed_tracks = clean.loc[linear].apply(savgol_on_srs, 1)
+ flat = set([k for v in contig.values for i in v for j in i for k in j])
+ smoothed_tracks = clean.loc[flat].apply(savgol_on_srs, 1)
else:
contig = tracks.groupby(["trap"]).apply(get_contiguous_pairs)
contig = contig.loc[contig.apply(len) > 0]
- linear = set([k for v in contig.values for i in v for j in i for k in j])
- smoothed_tracks = tracks.loc[linear].apply(lambda x: np.array(x.values), axis=1)
+ flat = set([k for v in contig.values for i in v for j in i for k in j])
+ smoothed_tracks = tracks.loc[flat].apply(lambda x: np.array(x.values), axis=1)
# fetch edges from ids TODO (IF necessary, here we can compare growth rates)
idx_to_edge = lambda preposts: [
diff --git a/core/processor.py b/core/processor.py
index 516f4c1e..78edeeab 100644
--- a/core/processor.py
+++ b/core/processor.py
@@ -114,14 +114,15 @@ class PostProcessor:
with h5py.File(self._filename, "r") as f:
prev_idchanges = self._signal.get_id_changes()
- changes_history = prev_idchanges + [merge_events] # + [picks]
- self._writer.write("/id_changes", data=changes_history)
+ changes_history = prev_idchanges + merge_events
+ self._writer.write("id_changes", data=changes_history)
# self._writer.write(
# "/postprocessing/merge_events/",
# data=merge_events,
# meta={"source": "/cell_info/"},
# )
# changes_history += picks
+ # TODO add picks dataset
# picks = self.picker.run(self._signal[self.targets["prepost"]["picker"][0]])
# self._writer.write()
--
GitLab