From 355f50a060c813d8d424d324c34a58ebe65fde0f Mon Sep 17 00:00:00 2001
From: appel_c <christian.appel@psi.ch>
Date: Fri, 22 May 2026 14:45:11 +0200
Subject: [PATCH] wip devices

---
 debye_bec/devices/pilatus/pilatus.py |  5 +++--
 debye_bec/scans/xas_simple_scan.py   | 16 ++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debye_bec/devices/pilatus/pilatus.py b/debye_bec/devices/pilatus/pilatus.py
index 6c721fe..4590a88 100644
--- a/debye_bec/devices/pilatus/pilatus.py
+++ b/debye_bec/devices/pilatus/pilatus.py
@@ -260,7 +260,7 @@ class Pilatus(PSIDeviceBase, ADBase):
         # self._live_mode_run_event = threading.Event()
         # self._live_mode_stopped_event = threading.Event()
         # self._live_mode_stopped_event.set()  # Initial state is stopped
-        self.scan_parameters: ScanServerScanInfo | None = None
+        self.scan_parameters: ScanServerScanInfo = None
 
     ########################################
     #        Custom Beamline Methods       #
@@ -511,7 +511,8 @@ class Pilatus(PSIDeviceBase, ADBase):
             self.trigger_n_of.set(
                 self.scan_parameters.additional_scan_parameters.get("n_of_trigger", 1)
             ).wait(5)
-
+        # TODO migrate logic to v4 once old scans are deprecated,
+        # TODO if num_points=None and no logic from scan_name applies, can't measure with this detector..
         elif scan_msg.scan_type == "step":
             self.n_images = (
                 self.scan_parameters.num_monitored_readouts * scan_msg.frames_per_trigger
diff --git a/debye_bec/scans/xas_simple_scan.py b/debye_bec/scans/xas_simple_scan.py
index 871093a..d6a313f 100644
--- a/debye_bec/scans/xas_simple_scan.py
+++ b/debye_bec/scans/xas_simple_scan.py
@@ -37,7 +37,7 @@ class XasSimpleScan(ScanBase):
 
     def __init__(
         self,
-        #fmt: off
+        # fmt: off
         start: Annotated[float, ScanArgument(display_name="Start Energy", description="Start energy.", units=Units.eV, ge=4500, le=64000)],
         stop: Annotated[float, ScanArgument(display_name="Stop Energy", description="Stop energy.", units=Units.eV, ge=4500, le=64000)],
         scan_time: Annotated[float, ScanArgument(display_name="Scan Time", description="Time for one scan cycle.", units=Units.s, ge=0.05)],
@@ -45,7 +45,7 @@ class XasSimpleScan(ScanBase):
         motor: Annotated[DeviceBase | None, ScanArgument(display_name="Motor", description="Bragg motor device.")] = None,
         daq: Annotated[DeviceBase | None, ScanArgument(display_name="DAQ", description="NIDAQ device.")] = None,
         monitored_readout_cycle: Annotated[float, ScanArgument(display_name="Monitored Readout Cycle", description="Delay between monitored readouts.",units=Units.s, gt=0)] = 1,
-        #fmt: on
+        # fmt: on
         **kwargs,
     ):
         """
@@ -186,7 +186,7 @@ class XasSimpleScanWithXrd(XasSimpleScan):
 
     def __init__(
         self,
-        #fmt: off
+        # fmt: off
         start: Annotated[float, ScanArgument(display_name="Start Energy", description="Start energy.", units=Units.eV)],
         stop: Annotated[float, ScanArgument(display_name="Stop Energy", description="Stop energy.", units=Units.eV)],
         scan_time: Annotated[float, ScanArgument(display_name="Scan Time", description="Time for one scan cycle.", units=Units.s, ge=0)],
@@ -203,7 +203,7 @@ class XasSimpleScanWithXrd(XasSimpleScan):
         daq: Annotated[DeviceBase | None, ScanArgument(display_name="DAQ", description="NIDAQ device.")] = None,
         monitored_readout_cycle: Annotated[float, ScanArgument(display_name="Monitored Readout Cycle", description="Delay between monitored readouts.", units=Units.s, gt=0)] = 1,
         **kwargs,
-        #fmt: on
+        # fmt: on
     ):
         super().__init__(
             start=start,
@@ -239,7 +239,7 @@ class XasAdvancedScan(XasSimpleScan):
 
     def __init__(
         self,
-        #fmt: off
+        # fmt: off
         start: Annotated[float, ScanArgument(display_name="Start Energy", description="Start energy.", units=Units.eV)],
         stop: Annotated[float, ScanArgument(display_name="Stop Energy", description="Stop energy.", units=Units.eV)],
         scan_time: Annotated[float, ScanArgument(display_name="Scan Time", description="Time for one scan cycle.", units=Units.s, ge=0)],
@@ -250,7 +250,7 @@ class XasAdvancedScan(XasSimpleScan):
         daq: Annotated[DeviceBase | None, ScanArgument(display_name="DAQ", description="NIDAQ device.")] = None,
         monitored_readout_cycle: Annotated[float, ScanArgument(display_name="Monitored Readout Cycle", description="Delay between monitored readouts.", units=Units.s, gt=0)] = 1,
         **kwargs,
-        #fmt: on
+        # fmt: on
     ):
         super().__init__(
             start=start,
@@ -279,7 +279,7 @@ class XasAdvancedScanWithXrd(XasAdvancedScan):
 
     def __init__(
         self,
-        #fmt: off
+        # fmt: off
         start: Annotated[float, ScanArgument(display_name="Start Energy", description="Start energy.", units=Units.eV)],
         stop: Annotated[float, ScanArgument(display_name="Stop Energy", description="Stop energy.", units=Units.eV)],
         scan_time: Annotated[float, ScanArgument(display_name="Scan Time", description="Time for one scan cycle.", units=Units.s, ge=0)],
@@ -298,7 +298,7 @@ class XasAdvancedScanWithXrd(XasAdvancedScan):
         daq: Annotated[DeviceBase | None, ScanArgument(display_name="DAQ", description="NIDAQ device.")] = None,
         monitored_readout_cycle: Annotated[float, ScanArgument(display_name="Monitored Readout Cycle", description="Delay between monitored readouts.", units=Units.s, gt=0)] = 1,
         **kwargs,
-        #fmt: on
+        # fmt: on
     ):
         super().__init__(
             start=start,