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

aggregator changes are in-place

Browse Source
This commit is contained in:
augustin_s
2024-08-13 13:48:45 +02:00
parent e0e9cf02d7
commit fd2345c611
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dap/algos/forcesend.py
View File

@ -8,7 +8,7 @@ def calc_force_send(results, data, pixel_mask_pf, image, aggregator):
force_send_visualisation = False force_send_visualisation = False
if data.dtype == np.uint16: if data.dtype == np.uint16:
return data, force_send_visualisation, aggregator return data, force_send_visualisation
apply_aggregation = results.get("apply_aggregation", False) apply_aggregation = results.get("apply_aggregation", False)
apply_threshold = results.get("apply_threshold", False) apply_threshold = results.get("apply_threshold", False)
@ -18,15 +18,15 @@ def calc_force_send(results, data, pixel_mask_pf, image, aggregator):
if not apply_aggregation and not apply_threshold: if not apply_aggregation and not apply_threshold:
data = image data = image
return data, force_send_visualisation, aggregator return data, force_send_visualisation
calc_apply_threshold(results, data) # changes data in place calc_apply_threshold(results, data) # changes data in place
data, force_send_visualisation, aggregator = calc_apply_aggregation(results, data, aggregator) data, force_send_visualisation = calc_apply_aggregation(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
return data, force_send_visualisation, aggregator return data, force_send_visualisation
@ -52,10 +52,10 @@ def calc_apply_aggregation(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:
return data, force_send_visualisation, aggregator return data, force_send_visualisation
if "aggregation_max" not in results: if "aggregation_max" not in results:
return data, force_send_visualisation, aggregator return data, force_send_visualisation
aggregator += data aggregator += data
@ -69,7 +69,7 @@ def calc_apply_aggregation(results, data, aggregator):
force_send_visualisation = True force_send_visualisation = True
aggregator.reset() aggregator.reset()
return data, force_send_visualisation, aggregator return data, force_send_visualisation

2
dap/worker.py
View File

@ -116,7 +116,7 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
calc_peakfinder_analysis(results, pfdata, pixel_mask_pf) calc_peakfinder_analysis(results, pfdata, pixel_mask_pf)
# ??? # ???
data, force_send_visualisation, aggregator = calc_force_send(results, data, pixel_mask_pf, image, aggregator) data, force_send_visualisation = calc_force_send(results, data, pixel_mask_pf, image, aggregator)
results["type"] = str(data.dtype) results["type"] = str(data.dtype)
results["shape"] = data.shape results["shape"] = data.shape