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

adding edge px parameter

Browse Source
This commit was merged in pull request #10.
This commit is contained in:
woznic_n
2026-06-15 15:54:39 +02:00
parent d5d8157514
commit 6619059c2e
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dap/algos/jfdata.py
+6 -6
View File
@@ -33,8 +33,8 @@ class JFData:
self.ju_stream_adapter.handler.pixel_mask = pixel_mask_current
def process(self, image, metadata, double_pixels):
data = self.ju_stream_adapter.process(image, metadata, double_pixels=double_pixels)
def process(self, image, metadata, double_pixels, module_edge_pixels):
data = self.ju_stream_adapter.process(image, metadata, double_pixels=double_pixels, module_edge_pixels=module_edge_pixels)
# pedestal and gain files are loaded in process(), this check needs to be afterwards
if not self.ju_stream_adapter.handler.can_convert():
@@ -44,8 +44,8 @@ class JFData:
return data
def get_pixel_mask(self, results, double_pixels):
pixel_mask_corrected = self.ju_stream_adapter.handler.get_pixel_mask(double_pixels=double_pixels)
def get_pixel_mask(self, results, double_pixels, module_edge_pixels):
pixel_mask_corrected = self.ju_stream_adapter.handler.get_pixel_mask(double_pixels=double_pixels, module_edge_pixels=module_edge_pixels)
if pixel_mask_corrected is None:
self.id_pixel_mask_corrected = None
self.pixel_mask = None
@@ -67,8 +67,8 @@ class JFData:
return pixel_mask
def get_saturated_pixels(self, image, double_pixels):
return self.ju_stream_adapter.handler.get_saturated_pixels(image, double_pixels=double_pixels)
def get_saturated_pixels(self, image, double_pixels, module_edge_pixels):
return self.ju_stream_adapter.handler.get_saturated_pixels(image, double_pixels=double_pixels, module_edge_pixels=module_edge_pixels)
dap/worker.py
+4 -3
View File
@@ -99,16 +99,17 @@ def work(backend_addr, accumulator_addr, visualisation_addr, fn_config, skip_fra
jfdata.ensure_current_pixel_mask(pedestal_name)
double_pixels = results.get("double_pixels", "mask")
module_edge_pixels = results.get("module_edge_pixels", "keep")
image = jfdata.process(raw_image, metadata, double_pixels)
image = jfdata.process(raw_image, metadata, double_pixels, module_edge_pixels)
if image is None:
continue
pixel_mask = jfdata.get_pixel_mask(results, double_pixels)
pixel_mask = jfdata.get_pixel_mask(results, double_pixels, module_edge_pixels)
if pixel_mask is not None:
saturated_pixels_y, saturated_pixels_x = jfdata.get_saturated_pixels(raw_image, double_pixels)
saturated_pixels_y, saturated_pixels_x = jfdata.get_saturated_pixels(raw_image, double_pixels, module_edge_pixels)
results["saturated_pixels"] = len(saturated_pixels_x)
results["saturated_pixels_x"] = saturated_pixels_x
results["saturated_pixels_y"] = saturated_pixels_y