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

moved spi_analysis out of work function

Browse Source
This commit is contained in:
augustin_s
2024-07-30 18:09:56 +02:00
parent c3044653c2
commit 5d714e1fa3
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dap/algos/__init__.py
View File

@ -2,5 +2,6 @@
from .radprof import calc_radial_integration from .radprof import calc_radial_integration
from .addmask import calc_apply_additional_mask from .addmask import calc_apply_additional_mask
from .peakfind import calc_peakfinder_analysis from .peakfind import calc_peakfinder_analysis
from .spiana import calc_spi_analysis

16
dap/algos/spiana.py Normal file
View File

@ -0,0 +1,16 @@
def calc_spi_analysis(results):
if "spi_limit" in results and len(results["spi_limit"]) == 2:
number_of_spots = 0
if results["roi_intensities_normalised"][0] >= results["spi_limit"][0]:
number_of_spots += 25
if results["roi_intensities_normalised"][1] >= results["spi_limit"][1]:
number_of_spots += 50
results["number_of_spots"] = number_of_spots
if number_of_spots > 0:
results["is_hit_frame"] = True

16
dap/worker.py
View File

@ -7,7 +7,7 @@ from time import sleep
import jungfrau_utils as ju import jungfrau_utils as ju
import numpy as np import numpy as np
from algos import calc_radial_integration, calc_apply_additional_mask, calc_peakfinder_analysis from algos import calc_radial_integration, calc_apply_additional_mask, calc_peakfinder_analysis, calc_spi_analysis
from zmqsocks import ZMQSockets from zmqsocks import ZMQSockets
from utils import json_load, read_bit from utils import json_load, read_bit
@ -227,20 +227,8 @@ 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 and "roi_intensities_normalised" in results and len(results["roi_intensities_normalised"]) >= 2:
calc_spi_analysis(results)
if "spi_limit" in results and len(results["spi_limit"]) == 2:
number_of_spots = 0
if results["roi_intensities_normalised"][0] >= results["spi_limit"][0]:
number_of_spots += 25
if results["roi_intensities_normalised"][1] >= results["spi_limit"][1]:
number_of_spots += 50
results["number_of_spots"] = number_of_spots
if number_of_spots > 0:
results["is_hit_frame"] = True
# in case all needed parameters are present, make peakfinding # in case all needed parameters are present, make peakfinding
do_peakfinder_analysis = results.get("do_peakfinder_analysis", False) do_peakfinder_analysis = results.get("do_peakfinder_analysis", False)