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

order

Browse Source
This commit is contained in:
augustin_s
2024-08-06 17:01:02 +02:00
parent 159574f4e8
commit 6639b46afb
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dap/worker.py
View File

@ -45,13 +45,14 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
peakfinder_parameters = json_load(fn_peakfinder_parameters) peakfinder_parameters = json_load(fn_peakfinder_parameters)
peakfinder_parameters_time = os.path.getmtime(fn_peakfinder_parameters) peakfinder_parameters_time = os.path.getmtime(fn_peakfinder_parameters)
pulse_id = 0
jfdata = JFData() jfdata = JFData()
zmq_socks = ZMQSockets(backend_address, accumulator_host, accumulator_port, visualisation_host, visualisation_port) zmq_socks = ZMQSockets(backend_address, accumulator_host, accumulator_port, visualisation_host, visualisation_port)
pulse_id = 0
n_aggregated_images = 1 n_aggregated_images = 1
data_summed = None data_summed = None
@ -84,10 +85,9 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
if metadata["shape"] == [2, 2]: # this is used as marker for empty images if metadata["shape"] == [2, 2]: # this is used as marker for empty images
continue continue
pulse_id = metadata.get("pulse_id", 0)
results = metadata.copy() results = metadata.copy()
pulse_id = results.get("pulse_id", 0)
results.update(peakfinder_parameters) results.update(peakfinder_parameters)
results["number_of_spots"] = 0 results["number_of_spots"] = 0
@ -128,11 +128,9 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
results["saturated_pixels_y"] = saturated_pixels_y.tolist() results["saturated_pixels_y"] = saturated_pixels_y.tolist()
# pump probe analysis
calc_radial_integration(results, data, pixel_mask_pf) calc_radial_integration(results, data, pixel_mask_pf)
#copy image to work with peakfinder, just in case pfdata = data.copy() #TODO: is this copy needed?
pfdata = data.copy()
calc_mask_pixels(pfdata, pixel_mask_pf) # changes pfdata in place calc_mask_pixels(pfdata, pixel_mask_pf) # changes pfdata in place
calc_apply_threshold(results, pfdata) # changes pfdata in place calc_apply_threshold(results, pfdata) # changes pfdata in place