diff --git a/dap/algos/__init__.py b/dap/algos/__init__.py index f30eec4..2b5f92e 100644 --- a/dap/algos/__init__.py +++ b/dap/algos/__init__.py @@ -1,7 +1,7 @@ from .addmask import calc_apply_additional_mask +from .aggregation import calc_apply_aggregation from .jfdata import JFData -from .forcesend import calc_force_send from .mask import calc_mask_pixels from .peakfind import calc_peakfinder_analysis from .radprof import calc_radial_integration diff --git a/dap/algos/forcesend.py b/dap/algos/aggregation.py similarity index 92% rename from dap/algos/forcesend.py rename to dap/algos/aggregation.py index 2f76b12..eeaf929 100644 --- a/dap/algos/forcesend.py +++ b/dap/algos/aggregation.py @@ -4,7 +4,7 @@ from .mask import calc_mask_pixels from .thresh import threshold -def calc_force_send(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) aggregation_ready = calc_aggregation_ready(results, data, aggregator) return data, aggregation_ready @@ -27,7 +27,7 @@ def calc_data(results, data, pixel_mask_pf, image, aggregator): calc_apply_threshold(results, data) # changes data in place - data = calc_apply_aggregation(results, data, aggregator) + data = calc_aggregate(results, data, aggregator) calc_mask_pixels(data, pixel_mask_pf) # changes data in place @@ -52,7 +52,7 @@ def calc_apply_threshold(results, data): -def calc_apply_aggregation(results, data, aggregator): +def calc_aggregate(results, data, aggregator): apply_aggregation = results.get("apply_aggregation", False) if not apply_aggregation: return data diff --git a/dap/worker.py b/dap/worker.py index a6c0f06..f11fd0d 100644 --- a/dap/worker.py +++ b/dap/worker.py @@ -2,7 +2,7 @@ import argparse import numpy as np -from algos import calc_apply_threshold, calc_force_send, calc_mask_pixels, calc_peakfinder_analysis, calc_radial_integration, calc_roi, calc_spi_analysis, JFData +from algos import calc_apply_aggregation, calc_apply_threshold, calc_mask_pixels, calc_peakfinder_analysis, calc_radial_integration, calc_roi, calc_spi_analysis, JFData from utils import Aggregator, BufferedJSON, randskip, read_bit from zmqsocks import ZMQSockets @@ -115,7 +115,7 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host calc_peakfinder_analysis(results, pfdata, pixel_mask_pf) # ??? - data, aggregation_is_ready = calc_force_send(results, data, pixel_mask_pf, image, aggregator) + data, aggregation_is_ready = calc_apply_aggregation(results, data, pixel_mask_pf, image, aggregator) results["type"] = str(data.dtype) results["shape"] = data.shape