From 92149d0614c75c48ebadd1662e59e14445ce053b Mon Sep 17 00:00:00 2001
From: Sven Augustin <sven.augustin@psi.ch>
Date: Fri, 2 Aug 2024 12:01:01 +0200
Subject: [PATCH] moved do_* checks inside function for better overview

---
 dap/algos/addmask.py  |  4 ++++
 dap/algos/peakfind.py |  4 ++++
 dap/algos/spiana.py   |  4 ++++
 dap/worker.py         | 24 ++++++------------------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dap/algos/addmask.py b/dap/algos/addmask.py
index d547359..41e8576 100644
--- a/dap/algos/addmask.py
+++ b/dap/algos/addmask.py
@@ -1,6 +1,10 @@
 #TODO: find a better way to handle this
 
 def calc_apply_additional_mask(detector, pixel_mask_pf):
+    apply_additional_mask = results.get("apply_additional_mask", False)
+    if not apply_additional_mask:
+        return
+
     if detector == "JF06T08V04":
         # edge pixels
         pixel_mask_pf[0:1030, 1100] = 0
diff --git a/dap/algos/peakfind.py b/dap/algos/peakfind.py
index 639721d..6667d87 100644
--- a/dap/algos/peakfind.py
+++ b/dap/algos/peakfind.py
@@ -6,6 +6,10 @@ from peakfinder8_extension import peakfinder_8
 
 
 def calc_peakfinder_analysis(results, data, pixel_mask_pf):
+    do_peakfinder_analysis = results.get("do_peakfinder_analysis", False)
+    if not do_peakfinder_analysis:
+        return
+
     if pixel_mask_pf is None:
         return
 
diff --git a/dap/algos/spiana.py b/dap/algos/spiana.py
index fb535c2..593aaf7 100644
--- a/dap/algos/spiana.py
+++ b/dap/algos/spiana.py
@@ -1,5 +1,9 @@
 
 def calc_spi_analysis(results):
+    do_spi_analysis = results.get("do_spi_analysis", False)
+    if not do_spi_analysis:
+        return
+
     for k in ("spi_limit", "roi_intensities_normalised"):
         if k not in results:
             return
diff --git a/dap/worker.py b/dap/worker.py
index 6225ee7..07fe014 100644
--- a/dap/worker.py
+++ b/dap/worker.py
@@ -159,10 +159,9 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
             else:
                 pixel_mask_pf = None
 
-# add additional mask at the edge of modules for JF06T08
-        apply_additional_mask = results.get("apply_additional_mask", False)
-        if apply_additional_mask:
-            calc_apply_additional_mask(detector, pixel_mask_pf)
+
+        calc_apply_additional_mask(detector, pixel_mask_pf)
+
 
         if pixel_mask_corrected is not None:
             data_s = copy(image)
@@ -195,20 +194,9 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
             if threshold_max > threshold_min:
                 pfdata[pfdata > threshold_max] = threshold_value
 
-    # if roi calculation request is present, make it
-        do_roi = ("roi_x1" in results)
-        if do_roi:
-            calc_roi(results, pfdata, pixel_mask_pf, threshold_value_choice)
-
-# SPI analysis
-        do_spi_analysis = results.get("do_spi_analysis", False)
-        if do_spi_analysis:
-            calc_spi_analysis(results)
-
-# in case all needed parameters are present, make peakfinding
-        do_peakfinder_analysis = results.get("do_peakfinder_analysis", False)
-        if do_peakfinder_analysis:
-            calc_peakfinder_analysis(results, pfdata, pixel_mask_pf)
+        calc_roi(results, pfdata, pixel_mask_pf, threshold_value_choice)
+        calc_spi_analysis(results)
+        calc_peakfinder_analysis(results, pfdata, pixel_mask_pf)
 
 # ???
         forceSendVisualisation = False