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

combined a bit more of the logic

Browse Source
This commit is contained in:
augustin_s
2024-08-06 16:37:56 +02:00
parent 9fb9595c83
commit 159574f4e8
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dap/algos/jfdata.py
View File

@ -33,11 +33,14 @@ class JFData:
def process(self, image, metadata, double_pixels): def process(self, image, metadata, double_pixels):
return self.ju_stream_adapter.process(image, metadata, double_pixels=double_pixels) data = self.ju_stream_adapter.process(image, metadata, double_pixels=double_pixels)
# the pedestal file is loaded in process(), this check needs to be afterwards
if not self.ju_stream_adapter.handler.pedestal_file:
return None
def has_pedestal_file(self): data = np.ascontiguousarray(data)
return bool(self.ju_stream_adapter.handler.pedestal_file) return data
def get_pixel_mask(self, results, double_pixels): def get_pixel_mask(self, results, double_pixels):

5
dap/worker.py
View File

@ -116,12 +116,9 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
data = jfdata.process(image, metadata, double_pixels) data = jfdata.process(image, metadata, double_pixels)
# the pedestal file is loaded in process(), this check needs to be afterwards if not data:
if not jfdata.has_pedestal_file():
continue continue
data = np.ascontiguousarray(data)
pixel_mask_pf = jfdata.get_pixel_mask(results, double_pixels) pixel_mask_pf = jfdata.get_pixel_mask(results, double_pixels)
if pixel_mask_pf is not None: if pixel_mask_pf is not None: