bec/ophyd_devices
1
0
Fork 0
Code Issues 9 Pull Requests 10 Actions Packages Projects Releases 126 Wiki Activity

fix: add status update std_daq

Browse Source
This commit is contained in:
e21206 2023-08-23 09:42:22 +02:00
parent fb8619d047
commit 39142ffc92
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ophyd_devices/epics/devices/eiger9m_csaxs.py
View File

@ -111,6 +111,15 @@ class Eiger9mCsaxs(DetectorBase):
def _init_standard_daq(self) -> None: def _init_standard_daq(self) -> None:
self.std_rest_server_url = "http://xbl-daq-29:5000" self.std_rest_server_url = "http://xbl-daq-29:5000"
self.std_client = StdDaqClient(url_base=self.std_rest_server_url) self.std_client = StdDaqClient(url_base=self.std_rest_server_url)
timeout = 0
# TODO
while not std_status["state"] == "READY":
time.sleep(0.1)
timeout = timeout + 0.1
if timeout > 2:
logger.info("Timeout of STD")
# TODO check status after sleep
def _get_current_scan_msg(self) -> BECMessage.ScanStatusMessage: def _get_current_scan_msg(self) -> BECMessage.ScanStatusMessage:
msg = self.device_manager.producer.get(MessageEndpoints.scan_status()) msg = self.device_manager.producer.get(MessageEndpoints.scan_status())
@ -184,7 +193,16 @@ class Eiger9mCsaxs(DetectorBase):
"""unstage the detector and file writer""" """unstage the detector and file writer"""
self.timing_mode = 0 self.timing_mode = 0
self._close_file_writer() self._close_file_writer()
# TODO file succesfully written? std_status = self.std_client.get_status()
if (
not std_status["acquisition"]["message"] == "Completed"
or std_status["acquisition"]["state"] == "FINISHED"
):
logger.info(std_status)
# TODO add BEC error message
# raise
# TODO check detector stateX12SA-ES-EIGER9M:cam1:DetectorState_RBV
state = True state = True
msg = BECMessage.FileMessage(file_path=self.filepath, done=True, successful=state) msg = BECMessage.FileMessage(file_path=self.filepath, done=True, successful=state)
self.producer.set_and_publish( self.producer.set_and_publish(