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

disentangle

Browse Source
This commit is contained in:
augustin_s
2024-08-21 15:55:23 +02:00
parent 18d6dd0b7b
commit b1f104a71d
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dap/algos/aggregation.py
View File

@ -5,13 +5,14 @@ from .thresh import threshold
def calc_apply_aggregation(results, data, pixel_mask_pf, image, aggregator): def calc_apply_aggregation(results, data, pixel_mask_pf, image, aggregator):
data = calc_data(results, data, pixel_mask_pf, image, aggregator) data = calc_data(results, data, image, aggregator)
calc_mask_pixels(data, pixel_mask_pf) # changes data in place
aggregation_ready = calc_aggregation_ready(results, data, aggregator) aggregation_ready = calc_aggregation_ready(results, data, aggregator)
return data, aggregation_ready return data, aggregation_ready
def calc_data(results, data, pixel_mask_pf, image, aggregator): def calc_data(results, data, image, aggregator):
if data.dtype == np.uint16: if data.dtype == np.uint16:
return data return data
@ -27,11 +28,7 @@ def calc_data(results, data, pixel_mask_pf, image, aggregator):
calc_apply_threshold(results, data) # changes data in place calc_apply_threshold(results, data) # changes data in place
data = calc_aggregate(results, data, aggregator) return calc_aggregate(results, data, aggregator)
calc_mask_pixels(data, pixel_mask_pf) # changes data in place
return data