From cc0113507bd6db70fcdf41186ece4db01c9ef009 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Thu, 29 Aug 2024 10:36:31 +0200 Subject: [PATCH] removed unreachable special case for raw data (uint16) reaching aggregation [adapter.process calls handler.process with conversion=handler.can_convert(), which checks if gain and pedestal are truthy; with conversion, the dtype is float32 or int32; if handler.pedestal_file is falsy, the image is skipped upon receive -> special case can never trigger] --- dap/algos/aggregation.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dap/algos/aggregation.py b/dap/algos/aggregation.py index b728db4..18109f0 100644 --- a/dap/algos/aggregation.py +++ b/dap/algos/aggregation.py @@ -14,9 +14,6 @@ def calc_apply_aggregation(results, data, pixel_mask_pf, aggregator): def calc_data(results, data, aggregator): - if data.dtype == np.uint16: - return data - apply_aggregation = results.get("apply_aggregation", False) if not apply_aggregation: @@ -64,9 +61,6 @@ def calc_aggregate(results, data, aggregator): def calc_aggregation_ready(results, data, aggregator): - if data.dtype == np.uint16: - return False - apply_aggregation = results.get("apply_aggregation", False) apply_threshold = results.get("apply_threshold", False)