bec/ophyd_devices
0
0
Fork 0
mirror of https://github.com/bec-project/ophyd_devices.git synced 2025-07-10 02:38:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: reworked arm to

Browse Source
This commit is contained in:
Christian Appel
2023-10-20 16:58:44 +02:00
parent 6dae767c5e
commit ce8616a979
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,6 +250,7 @@ class Eiger9mCsaxs(DetectorBase):
time.sleep(0.05)
return super().stage()
#TODO function for abstract class?
def _prep_file_writer(self) -> None:
"""Prepare file writer for scan
@ -283,11 +284,13 @@ class Eiger9mCsaxs(DetectorBase):
break
time.sleep(0.005)
#TODO function for abstract class?
def _close_file_writer(self) -> None:
"""Close file writer"""
self.std_client.stop_writer()
#TODO can I wait for a status message here maybe? To ensure writer returned
#TODO function for abstract class?
def _prep_det(self) -> None:
"""Prepare detector for scan.
Includes checking the detector threshold, setting the acquisition parameters and setting the trigger source
@ -334,6 +337,20 @@ class Eiger9mCsaxs(DetectorBase):
MessageEndpoints.file_event(self.name),
msg.dumps(),
)
def arm_acquisition(self) -> None:
"""Arm detector for acquisition
"""
self.cam.acquire.put(1)
logger.info("Waiting for Eiger9m to be armed")
while True:
det_ctrl = self.cam.detector_state.read()[self.cam.detector_state.name]["value"]
if det_ctrl == int(DetectorState.RUNNING):
break
if self._stopped == True:
break
time.sleep(0.005)
logger.info("Eiger9m is armed")
#TODO needed? if yes why only for the eiger9m?
@threadlocked
@ -389,21 +406,6 @@ class Eiger9mCsaxs(DetectorBase):
)
self._close_file_writer()
def arm_acquisition(self) -> None:
"""Start acquisition in software trigger mode,
or arm the detector in hardware of the detector
"""
self.cam.acquire.put(1)
logger.info("Waiting for Eiger9m to be armed")
while True:
det_ctrl = self.cam.detector_state.read()[self.cam.detector_state.name]["value"]
if det_ctrl == int(DetectorState.RUNNING):
break
if self._stopped == True:
break
time.sleep(0.005)
logger.info("Eiger9m is armed")
def stop_acquisition(self) -> None:
"""Stop the detector and wait for the proper status message"""
logger.info("Waiting for Eiger9m to be armed")