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

moved masking pixels out of work function

Browse Source
This commit is contained in:
augustin_s
2024-08-02 13:26:02 +02:00
parent 6af0166f07
commit bf7f62adff
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dap/algos/__init__.py
View File

@ -1,5 +1,6 @@
from .addmask import calc_apply_additional_mask
from .mask import calc_mask_pixels
from .peakfind import calc_peakfinder_analysis
from .radprof import calc_radial_integration
from .roi import calc_roi

9
dap/algos/mask.py Normal file
View File

@ -0,0 +1,9 @@
import numpy as np
def calc_mask_pixels(pfdata, pixel_mask_pf):
if pixel_mask_pf is not None:
pfdata[pixel_mask_pf != 1] = np.nan #TODO: boolean mask

7
dap/worker.py
View File

@ -7,7 +7,7 @@ from time import sleep
import jungfrau_utils as ju
import numpy as np
from algos import calc_apply_additional_mask, calc_apply_threshold, calc_peakfinder_analysis, calc_radial_integration, calc_roi, calc_spi_analysis
from algos import calc_apply_additional_mask, calc_apply_threshold, calc_mask_pixels, calc_peakfinder_analysis, calc_radial_integration, calc_roi, calc_spi_analysis
from utils import json_load, read_bit
from zmqsocks import ZMQSockets
@ -180,10 +180,7 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
#copy image to work with peakfinder, just in case
pfdata = np.copy(data)
# make all masked pixels values nans
if pixel_mask_pf is not None:
pfdata[pixel_mask_pf != 1] = np.nan #TODO: boolean mask
calc_mask_pixels(pfdata, pixel_mask_pf) # changes pfdata in place
calc_apply_threshold(results, pfdata) # changes pfdata in place
calc_roi(results, pfdata, pixel_mask_pf)
calc_spi_analysis(results)