Add total intensity computation, fix names

src/cal_tools/litpx_counter.py

@@ -113,9 +113,12 @@ class LitPixelCounter(AnalysisAddon):
 
     channel = "litpx"
     output_fields = [
-        "cellId", "pulseId", "trainId", "litPixels", "goodPixels"]
+        "cellId", "pulseId", "trainId",
+        "litPixels", "unmaskedPixels", "totalIntensity"
+    ]
     required_data = [
-        "data", "mask", "cellId", "pulseId", "trainId"]
+        "data", "mask", "cellId", "pulseId", "trainId"
+    ]
 
     def __init__(self, data, threshold=0.8):
         """Initialize the instance of lit-pixel analysis addon.
@@ -135,19 +138,23 @@ class LitPixelCounter(AnalysisAddon):
         self.mask = data["mask"]
 
         self.threshold = threshold
-        self.num_good_px = sharedmem.full(self.max_images, 0, int)
+        self.num_unmasked_px = sharedmem.full(self.max_images, 0, int)
         self.num_lit_px = sharedmem.full(self.max_images, 0, int)
+        self.total_intensity = sharedmem.full(self.max_images, 0, int)
 
         self.data["litPixels"] = self.num_lit_px
-        self.data["goodPixels"] = self.num_good_px
+        self.data["unmaskedPixels"] = self.num_unmasked_px
+        self.data["totalIntensity"] = self.total_intensity
 
     def process(self, chunk):
         ix = range(*chunk.indices(self.num_images))
         for i in ix:
             mask = self.mask[i] == 0
+            self.total_intensity[i] = np.sum(
+                self.image[i], initial=0, where=mask)
             self.num_lit_px[i] = np.sum(
                 self.image[i] > self.threshold, initial=0, where=mask)
-            self.num_good_px[i] = np.sum(mask)
+            self.num_unmasked_px[i] = np.sum(mask)
 
     def source_name(self, karabo_id, channel):
         return f"{karabo_id}/LITPX/{channel}"