bec/debye_bec
0
0
Fork 0
Code Issues 9 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

wip devices

Browse Source
This commit is contained in:
appel_c
2026-05-22 14:45:11 +02:00
parent a8fcf6eb42
commit 355f50a060
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debye_bec/devices/pilatus/pilatus.py
+3 -2
View File
@@ -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
debye_bec/scans/xas_simple_scan.py
+8 -8
View File
@@ -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,