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

removed keep_pixels and use boolean array pixel_mask_pf instead

Browse Source
This commit is contained in:
augustin_s
2024-08-02 16:01:13 +02:00
parent 8cd2f07d80
commit 88f881fffd
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dap/algos/radprof.py
View File

@ -1,10 +1,7 @@
import numpy as np
def calc_radial_integration(results, data, keep_pixels, pixel_mask_pf, center_radial_integration, r_radial_integration):
if keep_pixels is None and pixel_mask_pf is not None:
keep_pixels = (pixel_mask_pf == 1) #TODO: boolean mask
def calc_radial_integration(results, data, pixel_mask_pf, center_radial_integration, r_radial_integration):
if center_radial_integration is None:
center_radial_integration = [
results["beam_center_x"],
@ -13,7 +10,7 @@ def calc_radial_integration(results, data, keep_pixels, pixel_mask_pf, center_ra
r_radial_integration = None
if r_radial_integration is None:
r_radial_integration, nr_radial_integration = prepare_radial_profile(data, center_radial_integration, keep_pixels)
r_radial_integration, nr_radial_integration = prepare_radial_profile(data, center_radial_integration, keep_pixels=pixel_mask_pf)
r_min = int(np.min(r_radial_integration))
r_max = int(np.max(r_radial_integration)) + 1
@ -29,7 +26,7 @@ def calc_radial_integration(results, data, keep_pixels, pixel_mask_pf, center_ra
if threshold_max > threshold_min:
data[data > threshold_max] = np.nan
rp = radial_profile(data, r_radial_integration, nr_radial_integration, keep_pixels)
rp = radial_profile(data, r_radial_integration, nr_radial_integration, keep_pixels=pixel_mask_pf)
silent_region_min = results.get("radial_integration_silent_min", None)
silent_region_max = results.get("radial_integration_silent_max", None)
@ -50,7 +47,7 @@ def calc_radial_integration(results, data, keep_pixels, pixel_mask_pf, center_ra
results["radint_I"] = rp[r_min:].tolist()
results["radint_q"] = [r_min, r_max]
return keep_pixels, center_radial_integration, r_radial_integration
return center_radial_integration, r_radial_integration

5
dap/worker.py
View File

@ -56,7 +56,6 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
# all the normal workers
worker = 1
keep_pixels = None
r_radial_integration = None
center_radial_integration = None
@ -145,10 +144,8 @@ 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:
keep_pixels = None
r_radial_integration = None
if pixel_mask_corrected is not None:
#pixel_mask_corrected = np.ascontiguousarray(pixel_mask_corrected)
pixel_mask_pf = np.ascontiguousarray(pixel_mask_corrected)
calc_apply_additional_mask(results, pixel_mask_pf) # changes pixel_mask_pf in place
else:
@ -165,7 +162,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:
keep_pixels, center_radial_integration, r_radial_integration = calc_radial_integration(results, data, keep_pixels, pixel_mask_pf, center_radial_integration, r_radial_integration)
center_radial_integration, r_radial_integration = calc_radial_integration(results, data, pixel_mask_pf, center_radial_integration, r_radial_integration)
#copy image to work with peakfinder, just in case