moved do_* checks inside function for better overview

This commit is contained in:
2024-08-02 12:01:01 +02:00
parent a34db9287e
commit 92149d0614
4 changed files with 18 additions and 18 deletions

View File

@ -1,6 +1,10 @@
#TODO: find a better way to handle this
def calc_apply_additional_mask(detector, pixel_mask_pf):
apply_additional_mask = results.get("apply_additional_mask", False)
if not apply_additional_mask:
return
if detector == "JF06T08V04":
# edge pixels
pixel_mask_pf[0:1030, 1100] = 0

View File

@ -6,6 +6,10 @@ from peakfinder8_extension import peakfinder_8
def calc_peakfinder_analysis(results, data, pixel_mask_pf):
do_peakfinder_analysis = results.get("do_peakfinder_analysis", False)
if not do_peakfinder_analysis:
return
if pixel_mask_pf is None:
return

View File

@ -1,5 +1,9 @@
def calc_spi_analysis(results):
do_spi_analysis = results.get("do_spi_analysis", False)
if not do_spi_analysis:
return
for k in ("spi_limit", "roi_intensities_normalised"):
if k not in results:
return

View File

@ -159,10 +159,9 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
else:
pixel_mask_pf = None
# add additional mask at the edge of modules for JF06T08
apply_additional_mask = results.get("apply_additional_mask", False)
if apply_additional_mask:
calc_apply_additional_mask(detector, pixel_mask_pf)
calc_apply_additional_mask(detector, pixel_mask_pf)
if pixel_mask_corrected is not None:
data_s = copy(image)
@ -195,20 +194,9 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
if threshold_max > threshold_min:
pfdata[pfdata > threshold_max] = threshold_value
# if roi calculation request is present, make it
do_roi = ("roi_x1" in results)
if do_roi:
calc_roi(results, pfdata, pixel_mask_pf, threshold_value_choice)
# SPI analysis
do_spi_analysis = results.get("do_spi_analysis", False)
if do_spi_analysis:
calc_spi_analysis(results)
# in case all needed parameters are present, make peakfinding
do_peakfinder_analysis = results.get("do_peakfinder_analysis", False)
if do_peakfinder_analysis:
calc_peakfinder_analysis(results, pfdata, pixel_mask_pf)
calc_roi(results, pfdata, pixel_mask_pf, threshold_value_choice)
calc_spi_analysis(results)
calc_peakfinder_analysis(results, pfdata, pixel_mask_pf)
# ???
forceSendVisualisation = False