From a6af8ee19cdc1270990017ea57845f2bd8bbd766 Mon Sep 17 00:00:00 2001
From: Sven Augustin <sven.augustin@psi.ch>
Date: Mon, 5 Aug 2024 18:15:31 +0200
Subject: [PATCH] use npmemo

---
 dap/algos/radprof.py | 19 +++++++++----------
 dap/worker.py        |  8 +-------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/dap/algos/radprof.py b/dap/algos/radprof.py
index cbea3a3..e3a4b28 100644
--- a/dap/algos/radprof.py
+++ b/dap/algos/radprof.py
@@ -1,16 +1,15 @@
 import numpy as np
 
+from .utils import npmemo
 
-def calc_radial_integration(results, data, pixel_mask_pf, center, rad, norm):
-    if center is None:
-        center = [
-            results["beam_center_x"],
-            results["beam_center_y"]
-        ]
-        rad = norm = None
 
-    if rad is None or norm is None:
-        rad, norm = prepare_radial_profile(data.shape, center, pixel_mask_pf)
+def calc_radial_integration(results, data, pixel_mask_pf):
+    center = [
+        results["beam_center_x"],
+        results["beam_center_y"]
+    ]
+
+    rad, norm = prepare_radial_profile(data.shape, center, pixel_mask_pf)
 
     r_min = min(rad)
     r_max = max(rad) + 1
@@ -48,9 +47,9 @@ def calc_radial_integration(results, data, pixel_mask_pf, center, rad, norm):
     results["radint_I"] = rp[r_min:].tolist() #TODO: why not stop at r_max?
     results["radint_q"] = [r_min, r_max]
 
-    return center, rad, norm
 
 
+@npmemo
 def prepare_radial_profile(shape, center, keep_pixels):
     y, x = np.indices(shape)
     x0, y0 = center
diff --git a/dap/worker.py b/dap/worker.py
index 2490c7b..e5b63f7 100644
--- a/dap/worker.py
+++ b/dap/worker.py
@@ -53,10 +53,6 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
     zmq_socks = ZMQSockets(backend_address, accumulator_host, accumulator_port, visualisation_host, visualisation_port)
 
 
-    center_radial_integration = None
-    rad_radial_integration = None
-    norm_radial_integration = None
-
     pedestal_name_saved = None
 
     pixel_mask_corrected = None
@@ -78,7 +74,6 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
                     sleep(0.5)
                     peakfinder_parameters = json_load(fn_peakfinder_parameters)
                     peakfinder_parameters_time = new_time
-                    center_radial_integration = None # beam_center_x/beam_center_y might have changed
 #                    if worker ==  0:
 #                        print(f"({pulse_id}) update peakfinder parameters {old_peakfinder_parameters}", flush=True)
 #                        print(f"                                     --> {peakfinder_parameters}", flush=True)
@@ -141,7 +136,6 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
         id_pixel_mask_2 = id(pixel_mask_corrected)
 
         if id_pixel_mask_1 != id_pixel_mask_2:
-            rad_radial_integration = norm_radial_integration = None # if the pixel mask changes, the radii and normalization need to be re-calculated
             if pixel_mask_corrected is not None:
                 pixel_mask_pf = np.ascontiguousarray(pixel_mask_corrected)
                 calc_apply_additional_mask(results, pixel_mask_pf) # changes pixel_mask_pf in place
@@ -158,7 +152,7 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
 # pump probe analysis
         do_radial_integration = results.get("do_radial_integration", False)
         if do_radial_integration:
-            center_radial_integration, rad_radial_integration, norm_radial_integration = calc_radial_integration(results, data, pixel_mask_pf, center_radial_integration, rad_radial_integration, norm_radial_integration)
+            calc_radial_integration(results, data, pixel_mask_pf)
 
 
     #copy image to work with peakfinder, just in case