From e69fcc62155139766e959cae58dd341e4f4fd59d Mon Sep 17 00:00:00 2001
From: appleb_m <martin.appleby@psi.ch>
Date: Mon, 15 Jun 2026 10:45:54 +0200
Subject: [PATCH] Removed old samcam functions

---
 src/aare/daq/daq.py     | 10 ----------
 src/aare/daq/devices.py | 24 ------------------------
 2 files changed, 34 deletions(-)

diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py
index 1f116092..f5450f82 100644
--- a/src/aare/daq/daq.py
+++ b/src/aare/daq/daq.py
@@ -1820,16 +1820,6 @@ class AareDAQ:
             logger.debug(f"Failed to change mounted sample: {e}")
             raise
 
-    @property
-    def camera_image(self) -> np.ndarray | None:
-        image = self.__devs.samcam_get_image(gray=False)
-        return image
-
-    @property
-    def camera_image_gray(self) -> np.ndarray | None:
-        image = self.__devs.samcam_get_image(gray=True)
-        return image
-
     def list_loaded_pucks(self) -> List[PuckLoadedInfo]:
         return []
 
diff --git a/src/aare/daq/devices.py b/src/aare/daq/devices.py
index eb665af9..eade4f22 100644
--- a/src/aare/daq/devices.py
+++ b/src/aare/daq/devices.py
@@ -241,30 +241,6 @@ class BeamlineDevices:
     def samcam_settings(self, settings: SampleCameraSettings):
         self.__sample_cam.setup(settings.gain, settings.exposure)
 
-    def samcam_get_image(self, /, gray: bool = False) -> np.ndarray:
-        """
-        Get the current sample camera image.
-
-        Primary source: ZMQ stream (same source as GUI)
-        Fallback: EPICS area_detector
-
-        Args:
-            gray: If True, return grayscale image
-
-        Returns:
-            numpy array with the image
-        """
-        # Try ZMQ source first if configured
-        if self.__use_zmq_camera and self.__zmq_camera is not None:
-            logger.debug("we are using zmq camera for mlbox and screenshots")
-            image = self.__zmq_camera.get_image(gray=gray)
-            if image is not None:
-                return image
-            logger.warning("ZMQ camera unavailable, falling back to EPICS area_detector")
-
-        # Fallback to EPICS area_detector
-        return self.__sample_cam.get_image(gray=gray)
-
     @log_timing(logger, "auto exposure of camera")
     def samcam_auto(self, state: AutoEnum):
         self.__sample_cam.set_auto(state)