From 67ce30db8d8c57759b663f7be2508b24c3fe22bd Mon Sep 17 00:00:00 2001
From: David Perl <david.perl@psi.ch>
Date: Mon, 13 Jul 2026 16:03:11 +0200
Subject: [PATCH] fix: remove commented legacy rotation code

---
 src/aare/daq/daq.py    | 49 ------------------------------------------
 src/aare/daq/server.py |  2 --
 2 files changed, 51 deletions(-)

diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py
index 29e6893a..75a366c6 100644
--- a/src/aare/daq/daq.py
+++ b/src/aare/daq/daq.py
@@ -1385,55 +1385,6 @@ class AareDAQ:
             )
             return None
 
-    # def _execute_rotation_sequence(self, rotation_request: RotationScanRequest) -> CompletedRotationScan | None:
-    #     """
-    #     Execute rotation scan.
-    #
-    #     Args:
-    #         rotation_request: Rotation scan parameters
-    #
-    #     Returns:
-    #         CompletedRotationScan result or None if failed
-    #     """
-    #     try:
-    #         status= self.status
-    #         if self.__cfg.simulated_detector:
-    #              logger.info("Simulated detector mode enabled; skipping JFJoch start.")
-    #         else:
-    #              self.__jfjoch.measure_rotation(rotation_request, status, self.__cfg.xrf)
-    #
-    #         self.__setup_datacollection(request=rotation_request)
-    #         if self.sample is not None and self.sample.db_id is not None:
-    #             self.__aare.send_sample_event(self.sample.db_id, SampleEventType.COLLECTING)
-    #
-    #         self.__set_state(BeamlineStateEnum.DataCollection)
-    #         result = self.__rotation(rotation_request)
-    #         self.__set_state(BeamlineStateEnum.SampleAlignment)
-    #         if self.sample is not None and self.sample.db_id is not None:
-    #             self.save_screenshot_db(self.sample.db_id, "scan_preview")
-    #             self.__aare.send_sample_event(self.sample.db_id, SampleEventType.COLLECTED)
-    #             self.__aare.ingest_scan(sample=self.sample, result=result.result,
-    #                                     geom=self.sample_geometry, beam_mark_pxl=self.__cfg.get_beam_mark(self.zoom))
-    #         return result
-    #     except JFJochCommunicationError as e:
-    #         logger.error(f"Rotation sequence failed due to JFJoch Communication error: {e}")
-    #         self._handle_operation_error(
-    #             operation=DAQOperation.ROTATION,
-    #             sample=self.sample,
-    #             error=e,
-    #             event_type=SampleEventType.COLLECTIONFAILED,
-    #             additional_comment=f"JFJoch communication error: {e}"
-    #         )
-    #         raise
-    #     except Exception as e:
-    #         logger.error(f"Rotation sequence failed: {e}")
-    #         self._handle_operation_error(
-    #             operation=DAQOperation.ROTATION,
-    #             sample=self.sample,
-    #             error=e,
-    #             event_type=SampleEventType.COLLECTIONFAILED
-    #         )
-    #         raise
 
     def _execute_rotation_sequence(
         self, rotation_request: RotationScanRequest
diff --git a/src/aare/daq/server.py b/src/aare/daq/server.py
index 08624a69..fcc37882 100644
--- a/src/aare/daq/server.py
+++ b/src/aare/daq/server.py
@@ -1,7 +1,6 @@
 import asyncio
 import hmac
 import importlib
-import io
 import json
 import os
 import random
@@ -9,7 +8,6 @@ import time
 from contextlib import asynccontextmanager
 from typing import AsyncGenerator, Optional
 
-import cv2
 import uvicorn
 from aarecommon.config.beamline import mx_beamline
 from aarecommon.config.logger import get_uvicorn_logging_config, setup_logger