From 12e008aeba14eb8453160471c14127c1ee284d35 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Tue, 30 Jul 2024 21:25:30 +0200 Subject: [PATCH] moved additional checks inside function --- dap/algos/peakfind.py | 7 +++++++ dap/worker.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dap/algos/peakfind.py b/dap/algos/peakfind.py index 8d57cba..2331f0e 100644 --- a/dap/algos/peakfind.py +++ b/dap/algos/peakfind.py @@ -6,6 +6,13 @@ from peakfinder8_extension import peakfinder_8 def calc_peakfinder_analysis(results, data, pixel_mask_pf): + if pixel_mask_pf is None: + return + + for k in ("beam_center_x", "beam_center_y", "hitfinder_min_snr", "hitfinder_min_pix_count", "hitfinder_adc_thresh"): + if k not in results: + return + x_beam = results["beam_center_x"] - 0.5 # to coordinates where position of first pixel/point is 0.5, 0.5 y_beam = results["beam_center_y"] - 0.5 # to coordinates where position of first pixel/point is 0.5, 0.5 diff --git a/dap/worker.py b/dap/worker.py index 561018d..2c9d9f6 100644 --- a/dap/worker.py +++ b/dap/worker.py @@ -211,7 +211,7 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host # in case all needed parameters are present, make peakfinding do_peakfinder_analysis = results.get("do_peakfinder_analysis", False) - if do_peakfinder_analysis and pixel_mask_pf is not None and all(k in results for k in ("beam_center_x", "beam_center_y", "hitfinder_min_snr", "hitfinder_min_pix_count", "hitfinder_adc_thresh")): + if do_peakfinder_analysis: calc_peakfinder_analysis(results, pfdata, pixel_mask_pf) # ???