sf-daq/dap
0
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved aggregator.reset() [this now also resets if aggregation_max wasnt given]

Browse Source
This commit is contained in:
augustin_s
2024-08-30 15:56:27 +02:00
parent 4db7f4f8cd
commit 7a05d8f095
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dap/algos/aggregation.py
View File

@ -4,23 +4,13 @@ from .thresh import threshold
def calc_apply_aggregation(results, data, pixel_mask_pf, aggregator): def calc_apply_aggregation(results, data, pixel_mask_pf, aggregator):
calc_apply_threshold(results, data) # changes data in place calc_apply_threshold(results, data) # changes data in place
data = calc_data(results, data, aggregator) data = calc_aggregate(results, data, aggregator)
calc_mask_pixels(data, pixel_mask_pf) # changes data in place calc_mask_pixels(data, pixel_mask_pf) # changes data in place
aggregation_ready = calc_aggregation_ready(results, aggregator) aggregation_ready = calc_aggregation_ready(results, aggregator)
return data, aggregation_ready return data, aggregation_ready
def calc_data(results, data, aggregator):
apply_aggregation = results.get("apply_aggregation", False)
if not apply_aggregation:
aggregator.reset()
return calc_aggregate(results, data, aggregator)
#TODO: this is duplicated in calc_apply_threshold and calc_radial_integration #TODO: this is duplicated in calc_apply_threshold and calc_radial_integration
def calc_apply_threshold(results, data): def calc_apply_threshold(results, data):
apply_threshold = results.get("apply_threshold", False) apply_threshold = results.get("apply_threshold", False)
@ -41,9 +31,11 @@ def calc_apply_threshold(results, data):
def calc_aggregate(results, data, aggregator): def calc_aggregate(results, data, aggregator):
apply_aggregation = results.get("apply_aggregation", False) apply_aggregation = results.get("apply_aggregation", False)
if not apply_aggregation: if not apply_aggregation:
aggregator.reset()
return data return data
if "aggregation_max" not in results: if "aggregation_max" not in results:
aggregator.reset()
return data return data
aggregator += data aggregator += data