diff --git a/dap/algos/jfdata.py b/dap/algos/jfdata.py index acf8bc1..f6fb0e4 100644 --- a/dap/algos/jfdata.py +++ b/dap/algos/jfdata.py @@ -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) diff --git a/dap/worker.py b/dap/worker.py index cba2103..ed73d4d 100644 --- a/dap/worker.py +++ b/dap/worker.py @@ -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