Merge branch 'master' of git.ecdf.ed.ac.uk:amuoz/post-processing

Former-commit-id: 02aae2c91e7650f75b858d55e69c52da77a0ad63

core/functions/tracks.py

@@ -313,7 +313,7 @@ def get_closest_pairs(pre: List[float], post: List[float], tol: Union[float, int
     result = dMetric[ids] / norm
     ids = ids if len(pre) < len(post) else ids[::-1]
 
-    return [idx for idx, res in zip(zip(*ids), result) if res < tol]
+    return [idx for idx, res in zip(zip(*ids), result) if res <= tol]
 
 
 def solve_matrix(dMetric):

core/processes/merger.py

@@ -45,7 +45,7 @@ class mergerParameters(ParametersABC):
 
 class merger(ProcessABC):
     """
-    TODO Integrate functions/tracks.py inside this class?
+    TODO check why it needs to be run a few times to complete the merging
     """
 
     def __init__(self, parameters):

core/processes/picker.py

@@ -116,5 +116,5 @@ class picker(ProcessABC):
 
 def _as_int(threshold: Union[float, int], ntps: int):
     if type(threshold) is float:
-        threshold = threshold / ntps
+        threshold = ntps * threshold
     return threshold

core/processor.py

@@ -112,18 +112,13 @@ class PostProcessor:
         merge_events = self.merger.run(self._signal[self.targets["prepost"]["merger"]])
 
         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)
-        # 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()
+            prev_idchanges = self._signal.get_merges()
+
+        changes_history = list(prev_idchanges) + [np.array(x) for x in merge_events]
+        self._writer.write("modifiers/merges", data=changes_history)
+
+        picks = self.picker.run(self._signal[self.targets["prepost"]["picker"][0]])
+        self._writer.write("modifiers/picks", data=picks)
 
     def run(self):
         self.run_prepost()