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

use npmemo

Browse Source
This commit is contained in:
augustin_s
2024-08-05 18:15:31 +02:00
parent 58c18d9b8c
commit a6af8ee19c
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dap/algos/radprof.py
View File

@ -1,16 +1,15 @@
import numpy as np
from .utils import npmemo
def calc_radial_integration(results, data, pixel_mask_pf, center, rad, norm):
if center is None:
center = [
results["beam_center_x"],
results["beam_center_y"]
]
rad = norm = None
if rad is None or norm is None:
rad, norm = prepare_radial_profile(data.shape, center, pixel_mask_pf)
def calc_radial_integration(results, data, pixel_mask_pf):
center = [
results["beam_center_x"],
results["beam_center_y"]
]
rad, norm = prepare_radial_profile(data.shape, center, pixel_mask_pf)
r_min = min(rad)
r_max = max(rad) + 1
@ -48,9 +47,9 @@ def calc_radial_integration(results, data, pixel_mask_pf, center, rad, norm):
results["radint_I"] = rp[r_min:].tolist() #TODO: why not stop at r_max?
results["radint_q"] = [r_min, r_max]
return center, rad, norm
@npmemo
def prepare_radial_profile(shape, center, keep_pixels):
y, x = np.indices(shape)
x0, y0 = center

8
dap/worker.py
View File

@ -53,10 +53,6 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
zmq_socks = ZMQSockets(backend_address, accumulator_host, accumulator_port, visualisation_host, visualisation_port)
center_radial_integration = None
rad_radial_integration = None
norm_radial_integration = None
pedestal_name_saved = None
pixel_mask_corrected = None
@ -78,7 +74,6 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
sleep(0.5)
peakfinder_parameters = json_load(fn_peakfinder_parameters)
peakfinder_parameters_time = new_time
center_radial_integration = None # beam_center_x/beam_center_y might have changed
# if worker == 0:
# print(f"({pulse_id}) update peakfinder parameters {old_peakfinder_parameters}", flush=True)
# print(f" --> {peakfinder_parameters}", flush=True)
@ -141,7 +136,6 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
id_pixel_mask_2 = id(pixel_mask_corrected)
if id_pixel_mask_1 != id_pixel_mask_2:
rad_radial_integration = norm_radial_integration = None # if the pixel mask changes, the radii and normalization need to be re-calculated
if pixel_mask_corrected is not None:
pixel_mask_pf = np.ascontiguousarray(pixel_mask_corrected)
calc_apply_additional_mask(results, pixel_mask_pf) # changes pixel_mask_pf in place
@ -158,7 +152,7 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
# pump probe analysis
do_radial_integration = results.get("do_radial_integration", False)
if do_radial_integration:
center_radial_integration, rad_radial_integration, norm_radial_integration = calc_radial_integration(results, data, pixel_mask_pf, center_radial_integration, rad_radial_integration, norm_radial_integration)
calc_radial_integration(results, data, pixel_mask_pf)
#copy image to work with peakfinder, just in case