moved pedestal_name_saved into JFData

dap/algos/jfdata.py

@@ -9,10 +9,24 @@ class JFData:
 
     def __init__(self):
         self.ju_stream_adapter = ju.StreamAdapter()
+        self.pedestal_name_saved = None
         self.id_pixel_mask_corrected = None
         self.pixel_mask_pf = None
 
 
+    def ensure_current_pixel_mask(self, pedestal_name):
+        if pedestal_name is None:
+            return
+
+        new_pedestal_name = pedestal_name
+        old_pedestal_name = self.pedestal_name_saved
+        if new_pedestal_name == old_pedestal_name:
+            return
+
+        self.refresh_pixel_mask()
+        self.pedestal_name_saved = pedestal_name
+
+
     def refresh_pixel_mask(self):
         pixel_mask_current = self.ju_stream_adapter.handler.pixel_mask
         self.ju_stream_adapter.handler.pixel_mask = pixel_mask_current

dap/worker.py

@@ -52,8 +52,6 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
     zmq_socks = ZMQSockets(backend_address, accumulator_host, accumulator_port, visualisation_host, visualisation_port)
 
 
-    pedestal_name_saved = None
-
     n_aggregated_images = 1
     data_summed = None
 
@@ -114,9 +112,7 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
 
         pedestal_name = metadata.get("pedestal_name", None)
 
-        if pedestal_name is not None and pedestal_name != pedestal_name_saved:
+        jfdata.ensure_current_pixel_mask(pedestal_name)
-            jfdata.refresh_pixel_mask()
-            pedestal_name_saved = pedestal_name
 
         data = jfdata.process(image, metadata, double_pixels)