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

test: resolved problem after merge conflict

Browse Source
This commit is contained in:
appel_c
2023-11-08 11:40:56 +01:00
parent 324f5091ec
commit f32fdbc845
1 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ophyd_devices/epics/devices/pilatus_csaxs.py
View File

@ -470,31 +470,6 @@ class PilatuscSAXS(DetectorBase):
"""Specify action that should be taken upon trigger signal.""" """Specify action that should be taken upon trigger signal."""
pass pass
def _publish_file_location(self, done=False, successful=False) -> None:
"""Publish the filepath to REDIS
First msg for file writer and the second one for other listeners (e.g. radial integ)
"""
pipe = self._producer.pipeline()
msg = BECMessage.FileMessage(file_path=self.filepath, done=done, successful=successful)
self._producer.set_and_publish(
MessageEndpoints.public_file(self.scaninfo.scanID, self.name), msg.dumps(), pipe=pipe
)
self._producer.set_and_publish(
MessageEndpoints.file_event(self.name), msg.dumps(), pip=pipe
)
pipe.execute()
# TODO function for abstract class?
def trigger(self) -> DeviceStatus:
"""Trigger the detector, called from BEC."""
self._on_trigger()
return super().trigger()
# TODO function for abstract class?
def _on_trigger(self):
"""Specify action that should be taken upon trigger signal."""
pass
def unstage(self) -> List[object]: def unstage(self) -> List[object]:
"""Unstage the device. """Unstage the device.
@ -567,10 +542,6 @@ class PilatuscSAXS(DetectorBase):
"""Stop the detector""" """Stop the detector"""
self.cam.acquire.put(0) self.cam.acquire.put(0)
def _stop_det(self) -> None:
"""Stop the detector"""
self.cam.acquire.put(0)
def stop(self, *, success=False) -> None: def stop(self, *, success=False) -> None:
"""Stop the scan, with camera and file writer""" """Stop the scan, with camera and file writer"""
self._stop_det() self._stop_det()