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

moved additional checks inside function; unpack variables from results dict

Browse Source
This commit is contained in:
augustin_s
2024-07-30 20:06:12 +02:00
parent 629d2c84bb
commit 1dd37e1684
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dap/algos/spiana.py
View File

@ -3,13 +3,23 @@ def calc_spi_analysis(results):
if "spi_limit" not in results: if "spi_limit" not in results:
return return
if len(results["spi_limit"]) != 2: spi_limit = results["spi_limit"]
if len(spi_limit) != 2:
return
if "roi_intensities_normalised" not in results:
return
roi_intensities_normalised = results["roi_intensities_normalised"]
if len(roi_intensities_normalised) < 2:
return return
number_of_spots = 0 number_of_spots = 0
if results["roi_intensities_normalised"][0] >= results["spi_limit"][0]: if roi_intensities_normalised[0] >= spi_limit[0]:
number_of_spots += 25 number_of_spots += 25
if results["roi_intensities_normalised"][1] >= results["spi_limit"][1]: if roi_intensities_normalised[1] >= spi_limit[1]:
number_of_spots += 50 number_of_spots += 50
results["number_of_spots"] = number_of_spots results["number_of_spots"] = number_of_spots

2
dap/worker.py
View File

@ -206,7 +206,7 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
# SPI analysis # SPI analysis
do_spi_analysis = results.get("do_spi_analysis", False) do_spi_analysis = results.get("do_spi_analysis", False)
if do_spi_analysis and "roi_intensities_normalised" in results and len(results["roi_intensities_normalised"]) >= 2: if do_spi_analysis:
calc_spi_analysis(results) calc_spi_analysis(results)
# in case all needed parameters are present, make peakfinding # in case all needed parameters are present, make peakfinding