bec/ophyd_devices
0
0
Fork 0
mirror of https://github.com/bec-project/ophyd_devices.git synced 2026-01-20 00:42:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Spyder style fixes...

Browse Source
This commit is contained in:
mohacsi_i
2024-06-03 16:11:24 +02:00
parent d46b349fd4
commit d99a5df604
1 changed files with 47 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
ophyd_devices/devices/std_daq_client.py
View File

@@ -6,7 +6,7 @@ Created on Mon Jun 3 14:16:29 2024
""" """
from time import sleep from time import sleep
from ophyd import Device, Signal, SignalRO, Component from ophyd import Device, SignalRO, Component
from std_daq_client import StdDaqClient from std_daq_client import StdDaqClient
@@ -19,9 +19,9 @@ from std_daq_client import StdDaqClient
class StdDaqClientDevice(Device): class StdDaqClientDevice(Device):
""" Lightweight wrapper around the official StdDaqClient ophyd package. """ Lightweight wrapper around the official StdDaqClient ophyd package.
Coincidentally also the StdDaqClient is using a Redis broker, that can Coincidentally also the StdDaqClient is using a Redis broker, that can
potentially be directly fed to the BEC. potentially be directly fed to the BEC.
""" """
# Status attributes # Status attributes
num_images = Component(SignalRO) num_images = Component(SignalRO)
@@ -29,7 +29,7 @@ class StdDaqClientDevice(Device):
output_file = Component(SignalRO) output_file = Component(SignalRO)
run_id = Component(SignalRO) run_id = Component(SignalRO)
state = Component(SignalRO) state = Component(SignalRO)
# Configuration attributes # Configuration attributes
bit_depth = Component(SignalRO) bit_depth = Component(SignalRO)
detector_name = Component(SignalRO) detector_name = Component(SignalRO)
@@ -37,7 +37,7 @@ class StdDaqClientDevice(Device):
image_pixel_width = Component(SignalRO) image_pixel_width = Component(SignalRO)
image_pixel_height = Component(SignalRO) image_pixel_height = Component(SignalRO)
start_udp_port = Component(SignalRO) start_udp_port = Component(SignalRO)
def __init__(self, *args, parent: Device = None, **kwargs) -> None: def __init__(self, *args, parent: Device = None, **kwargs) -> None:
super().__init__(*args, parent=parent, **kwargs) super().__init__(*args, parent=parent, **kwargs)
self.std_rest_server_url = ( self.std_rest_server_url = (
@@ -49,108 +49,98 @@ class StdDaqClientDevice(Device):
# Fill signals from current DAQ config # Fill signals from current DAQ config
self.poll_device_config() self.poll_device_config()
self.poll() self.poll()
def configure(self, d: dict) -> tuple: def configure(self, d: dict) -> tuple:
""" """
Example: Example:
std.configure(d={'bit_depth': 16, 'writer_user_id': 0}) std.configure(d={'bit_depth': 16, 'writer_user_id': 0})
""" """
if "n_images" in d: if "n_images" in d:
self._n_images = d['n_images'] self._n_images = d['n_images']
del d['n_images'] del d['n_images']
if "output_file" in d: if "output_file" in d:
self._output_file = d['output_file'] self._output_file = d['output_file']
del d['output_file'] del d['output_file']
old_config = self.client.get_config() old_config = self.client.get_config()
self.client.set_config(daq_config=d) self.client.set_config(daq_config=d)
new_config = self.client.get_config() new_config = self.client.get_config()
return (old_config, new_config) return (old_config, new_config)
def stage(self): def stage(self):
self.client.start_writer_async({'output_file': self._output_file, 'n_images': self._n_images}) self.client.start_writer_async(
{'output_file': self._output_file, 'n_images': self._n_images}
return )
sleep(0.1)
return super().stage()
#while True: #while True:
# sleep(0.1) # sleep(0.1)
# daq_status = self.client.get_status() # daq_status = self.client.get_status()
# if daq_status['acquisition']['state'] in ["ACQUIRING"]: # if daq_status['acquisition']['state'] in ["ACQUIRING"]:
# break # break
def unstage(self): def unstage(self):
""" Stop a running acquisition """
self.client.stop_writer()
return super().unstage()
def stop(self, *, success=False):
""" Stop a running acquisition """
self.client.stop_writer() self.client.stop_writer()
def stop(self): if success:
self.client.stop_writer() while True:
sleep(0.1)
daq_status = self.client.get_status()
if daq_status['acquisition']['state'] in ["STOPPED", "FINISHED"]:
break
def poll(self): def poll(self):
""" Querry the currrent status from Std DAQ"""
daq_status = self.client.get_status() daq_status = self.client.get_status()
# Put if new value (put runs subscriptions) # Put if new value (put runs subscriptions)
if self.n_images.value != daq_status['acquisition']['info']['n_images']: if self.n_images.value != daq_status['acquisition']['info']['n_images']:
self.n_images.put(daq_status['acquisition']['info']['n_images']) self.n_images.put(daq_status['acquisition']['info']['n_images'])
if self.n_written.value != daq_status['acquisition']['stats']['n_write_completed']: if self.n_written.value != daq_status['acquisition']['stats']['n_write_completed']:
self.n_written.put(daq_status['acquisition']['stats']['n_write_completed']) self.n_written.put(daq_status['acquisition']['stats']['n_write_completed'])
if self.output_file.value != daq_status['acquisition']['info']['output_file']: if self.output_file.value != daq_status['acquisition']['info']['output_file']:
self.output_file.put(daq_status['acquisition']['info']['output_file']) self.output_file.put(daq_status['acquisition']['info']['output_file'])
if self.run_id.value != daq_status['acquisition']['info']['run_id']: if self.run_id.value != daq_status['acquisition']['info']['run_id']:
self.run_id.put(daq_status['acquisition']['info']['run_id']) self.run_id.put(daq_status['acquisition']['info']['run_id'])
if self.state.value != daq_status['acquisition']['state']: if self.state.value != daq_status['acquisition']['state']:
self.state.put(daq_status['acquisition']['state']) self.state.put(daq_status['acquisition']['state'])
def poll_device_config(self): def poll_device_config(self):
""" Querry the currrent configuration from Std DAQ"""
daq_config = self.client.get_config() daq_config = self.client.get_config()
# Put if new value (put runs subscriptions) # Put if new value (put runs subscriptions)
if self.bit_depth.value != daq_config['bit_depth']: if self.bit_depth.value != daq_config['bit_depth']:
self.bit_depth.put(daq_config['bit_depth']) self.bit_depth.put(daq_config['bit_depth'])
if self.detector_name.value != daq_config['detector_name']: if self.detector_name.value != daq_config['detector_name']:
self.detector_name.put(daq_config['detector_name']) self.detector_name.put(daq_config['detector_name'])
if self.detector_type.value != daq_config['detector_type']: if self.detector_type.value != daq_config['detector_type']:
self.detector_type.put(daq_config['detector_type']) self.detector_type.put(daq_config['detector_type'])
if self.image_pixel_width.value != daq_config['image_pixel_width']: if self.image_pixel_width.value != daq_config['image_pixel_width']:
self.image_pixel_width.put(daq_config['image_pixel_width']) self.image_pixel_width.put(daq_config['image_pixel_width'])
if self.image_pixel_height.value != daq_config['image_pixel_height']: if self.image_pixel_height.value != daq_config['image_pixel_height']:
self.image_pixel_height.put(daq_config['image_pixel_height']) self.image_pixel_height.put(daq_config['image_pixel_height'])
if self.start_udp_port.value != daq_config['start_udp_port']:
self.start_udp_port.put(daq_config['start_udp_port'])
if self.start_udp_port.value != daq_config['start_udp_port']:
self.start_udp_port.put(daq_config['start_udp_port'])