From cb79be0a3e82af477d1a288597ad1dd9f01126aa Mon Sep 17 00:00:00 2001
From: Sven Augustin <sven.augustin@psi.ch>
Date: Wed, 28 Aug 2024 10:53:21 +0200
Subject: [PATCH] added/use Aggregator.is_ready

---
 dap/algos/aggregation.py | 4 ++--
 dap/utils/aggregator.py  | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dap/algos/aggregation.py b/dap/algos/aggregation.py
index 3b10789..b728db4 100644
--- a/dap/algos/aggregation.py
+++ b/dap/algos/aggregation.py
@@ -79,9 +79,9 @@ def calc_aggregation_ready(results, data, aggregator):
     if "aggregation_max" not in results:
         return False
 
-    n_aggregated_images = aggregator.counter
+    aggregation_max = results["aggregation_max"]
 
-    if n_aggregated_images < results["aggregation_max"]:
+    if not aggregator.is_ready(aggregation_max):
         return False
 
     aggregator.reset()
diff --git a/dap/utils/aggregator.py b/dap/utils/aggregator.py
index bd6d315..1d3cfab 100644
--- a/dap/utils/aggregator.py
+++ b/dap/utils/aggregator.py
@@ -19,6 +19,9 @@ class Aggregator:
 
     __iadd__ = add
 
+    def is_ready(self, nmax):
+        return (self.counter >= nmax)
+
     def __repr__(self):
         return f"{self.data!r} / {self.counter}"