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

consistent naming with the other algos

Browse Source
This commit is contained in:
augustin_s
2024-08-20 22:23:36 +02:00
parent 4b01cb0dca
commit 18d6dd0b7b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dap/algos/__init__.py
View File

@ -1,7 +1,7 @@
from .addmask import calc_apply_additional_mask from .addmask import calc_apply_additional_mask
from .aggregation import calc_apply_aggregation
from .jfdata import JFData from .jfdata import JFData
from .forcesend import calc_force_send
from .mask import calc_mask_pixels from .mask import calc_mask_pixels
from .peakfind import calc_peakfinder_analysis from .peakfind import calc_peakfinder_analysis
from .radprof import calc_radial_integration from .radprof import calc_radial_integration

6
dap/algos/forcesend.py → dap/algos/aggregation.py
View File

@ -4,7 +4,7 @@ from .mask import calc_mask_pixels
from .thresh import threshold 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) data = calc_data(results, data, pixel_mask_pf, image, aggregator)
aggregation_ready = calc_aggregation_ready(results, data, aggregator) aggregation_ready = calc_aggregation_ready(results, data, aggregator)
return data, aggregation_ready 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 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 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) apply_aggregation = results.get("apply_aggregation", False)
if not apply_aggregation: if not apply_aggregation:
return data return data

4
dap/worker.py
View File

@ -2,7 +2,7 @@ import argparse
import numpy as np 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 utils import Aggregator, BufferedJSON, randskip, read_bit
from zmqsocks import ZMQSockets 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) 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["type"] = str(data.dtype)
results["shape"] = data.shape results["shape"] = data.shape