From 4e4b0a9b33acdb153e61f068efd0856e9bbb17ed Mon Sep 17 00:00:00 2001
From: leonarski_f <filip.leonarski@psi.ch>
Date: Tue, 2 Jun 2026 20:05:38 +0200
Subject: [PATCH] AzIntEngine: Fixes

---
 image_analysis/azint/AzIntEngine.cpp    |  1 +
 image_analysis/azint/AzIntEngineCPU.cpp | 26 +--------------------
 image_analysis/azint/AzIntEngineCPU.h   | 30 +++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/image_analysis/azint/AzIntEngine.cpp b/image_analysis/azint/AzIntEngine.cpp
index 27d0d462..99cb8aab 100644
--- a/image_analysis/azint/AzIntEngine.cpp
+++ b/image_analysis/azint/AzIntEngine.cpp
@@ -7,5 +7,6 @@ AzIntEngine::AzIntEngine(const AzimuthalIntegrationMapping &integration)
 : integration(integration),
 npixel(integration.GetPixelToBin().size()),
 azint_sum(integration.GetBinNumber(), 0.0f),
+azint_sum2(integration.GetBinNumber(), 0.0f),
 azint_count(integration.GetBinNumber(), 0.0f),
 azint_bins(integration.GetBinNumber()){}
diff --git a/image_analysis/azint/AzIntEngineCPU.cpp b/image_analysis/azint/AzIntEngineCPU.cpp
index f8dc7321..9e848682 100644
--- a/image_analysis/azint/AzIntEngineCPU.cpp
+++ b/image_analysis/azint/AzIntEngineCPU.cpp
@@ -7,29 +7,5 @@ AzIntEngineCPU::AzIntEngineCPU(const AzimuthalIntegrationMapping &integration)
     : AzIntEngine(integration) {}
 
 void AzIntEngineCPU::Run(const ImagePreprocessorBuffer &image, AzimuthalIntegrationProfile &profile){
-
-    for (int i = 0; i < azint_count.size(); i++) {
-        azint_sum[i] = 0.0f;
-        azint_sum2[i] = 0.0f;
-        azint_count[i] = 0;
-    }
-
-    if (image.size() != npixel)
-        throw std::runtime_error("ImageSpotFinder::AzimIntegration: Mismatch in size");
-
-    const uint16_t *pixel_to_bin = integration.GetPixelToBin().data();
-    const float *corrections = integration.Corrections().data();
-
-    for (int i = 0; i < image.size(); i++) {
-        const uint16_t bin = pixel_to_bin[i];
-        if (bin < azint_bins) {
-            float val = static_cast<float>(image[i]) * corrections[i];
-            azint_sum[bin] += val;
-            azint_sum2[bin] += val * val;
-            ++azint_count[bin];
-        }
-    }
-
-    profile.Clear(integration);
-    profile.Add(azint_sum, azint_sum2, azint_count);
+   RunAzint(image, profile);
 }
diff --git a/image_analysis/azint/AzIntEngineCPU.h b/image_analysis/azint/AzIntEngineCPU.h
index d89c211d..3089cd45 100644
--- a/image_analysis/azint/AzIntEngineCPU.h
+++ b/image_analysis/azint/AzIntEngineCPU.h
@@ -7,6 +7,36 @@
 
 class AzIntEngineCPU : public AzIntEngine {
 public:
+    // image is anything that can be referenced with operator[]
+    template <class T>
+    void RunAzint(const T &image, AzimuthalIntegrationProfile &profile) {
+        for (int i = 0; i < azint_count.size(); i++) {
+            azint_sum[i] = 0.0f;
+            azint_sum2[i] = 0.0f;
+            azint_count[i] = 0;
+        }
+
+        if (image.size() != npixel)
+            throw std::runtime_error("ImageSpotFinder::AzimIntegration: Mismatch in size");
+
+        const uint16_t *pixel_to_bin = integration.GetPixelToBin().data();
+        const float *corrections = integration.Corrections().data();
+
+        for (int i = 0; i < image.size(); i++) {
+            const float val = static_cast<float>(image[i]) * corrections[i];
+            const float val_sq = val * val;
+            const uint16_t bin = pixel_to_bin[i];
+            if (bin < azint_bins) {
+                azint_sum[bin] += val;
+                azint_sum2[bin] += val_sq;
+                ++azint_count[bin];
+            }
+        }
+
+        profile.Clear(integration);
+        profile.Add(azint_sum, azint_sum2, azint_count);
+    }
+
     AzIntEngineCPU(const AzimuthalIntegrationMapping& integration);
     void Run(const ImagePreprocessorBuffer &image, AzimuthalIntegrationProfile &profile) override;
 };
\ No newline at end of file