fix: add bec producer message to stage
This commit is contained in:
e21206
parent
41e0e40bc7
commit
83c395cf35
@ -1,4 +1,5 @@
|
||||
import os
|
||||
import time
|
||||
from typing import List
|
||||
from ophyd import EpicsSignal, EpicsSignalRO, EpicsSignalWithRBV, Component as Cpt, Device
|
||||
|
||||
@ -6,6 +7,7 @@ from ophyd.mca import EpicsMCARecord, EpicsDXPMapping, EpicsDXPLowLevel, EpicsDX
|
||||
from ophyd.areadetector.plugins import HDF5Plugin, HDF5Plugin_V21, FilePlugin_V22
|
||||
|
||||
from bec_lib.core.file_utils import FileWriterMixin
|
||||
from bec_lib.core import MessageEndpoints, BECMessage, RedisConnector
|
||||
from bec_lib.core import bec_logger
|
||||
|
||||
logger = bec_logger.logger
|
||||
@ -29,6 +31,8 @@ class EpicsDXPFalcon(Device):
|
||||
detector_polarity = Cpt(EpicsSignalWithRBV, "DetectorPolarity")
|
||||
decay_time = Cpt(EpicsSignalWithRBV, "DecayTime")
|
||||
|
||||
current_pixel = Cpt(EpicsSignalRO, "CurrentPixel")
|
||||
|
||||
|
||||
class FalconHDF5Plugins(HDF5Plugin_V21, FilePlugin_V22):
|
||||
pass
|
||||
@ -45,16 +49,17 @@ class FalconCsaxs(Device):
|
||||
stop_all = Cpt(EpicsSignal, "StopAll")
|
||||
erase_all = Cpt(EpicsSignal, "EraseAll")
|
||||
start_all = Cpt(EpicsSignal, "StartAll")
|
||||
state = Cpt(EpicsSignal, "Acquiring")
|
||||
# Preset options
|
||||
preset_mode = Cpt(EpicsSignal, "PresetMode") # 0 No preset 1 Real time 2 Events 3 Triggers
|
||||
preset_real = Cpt(EpicsSignal, "PresetReal")
|
||||
preset_events = Cpt(EpicsSignal, "PresetEvents")
|
||||
preset_triggers = Cpt(EpicsSignal, "PresetTriggers")
|
||||
# read-only diagnostics
|
||||
triggers = Cpt(EpicsSignalRO, "Triggers", lazy=True)
|
||||
events = Cpt(EpicsSignalRO, "Events", lazy=True)
|
||||
input_count_rate = Cpt(EpicsSignalRO, "InputCountRate", lazy=True)
|
||||
output_count_rate = Cpt(EpicsSignalRO, "OutputCountRate", lazy=True)
|
||||
triggers = Cpt(EpicsSignalRO, "MaxTriggers", lazy=True)
|
||||
events = Cpt(EpicsSignalRO, "MaxEvents", lazy=True)
|
||||
input_count_rate = Cpt(EpicsSignalRO, "MaxInputCountRate", lazy=True)
|
||||
output_count_rate = Cpt(EpicsSignalRO, "MaxOutputCountRate", lazy=True)
|
||||
|
||||
# Mapping control
|
||||
collect_mode = Cpt(EpicsSignal, "CollectMode") # 0 MCA spectra, 1 MCA mapping
|
||||
@ -77,11 +82,6 @@ class FalconCsaxs(Device):
|
||||
device_manager=None,
|
||||
**kwargs,
|
||||
):
|
||||
self.device_manager = device_manager
|
||||
self.username = (
|
||||
"e21206" # self.device_manager.producer.get(MessageEndpoints.account()).decode()
|
||||
)
|
||||
# self.username = self.device_manager.producer.get(MessageEndpoints.account()).decode()
|
||||
super().__init__(
|
||||
prefix=prefix,
|
||||
name=name,
|
||||
@ -91,12 +91,21 @@ class FalconCsaxs(Device):
|
||||
parent=parent,
|
||||
**kwargs,
|
||||
)
|
||||
self.device_manager = device_manager
|
||||
self.username = (
|
||||
"e21206" # self.device_manager.producer.get(MessageEndpoints.account()).decode()
|
||||
)
|
||||
# self.username = self.device_manager.producer.get(MessageEndpoints.account()).decode()
|
||||
self.name = name
|
||||
# TODO meaningful to use FileWriterMixin
|
||||
self.service_cfg = {"base_path": f"/sls/X12SA/data/{self.username}/Data10/falcon/"}
|
||||
self.filewriter = FileWriterMixin(self.service_cfg)
|
||||
self.num_frames = 0
|
||||
self.readout = 0.003 # 3 ms
|
||||
self.triggermode = 0 # 0 : internal, scan must set this if hardware triggered
|
||||
self._value_pixel_per_buffer = 16
|
||||
self._file_template = f"%s%s_{self.name}.h5"
|
||||
# TODO localhost:6379
|
||||
self._producer = RedisConnector(["localhost:6379"]).producer()
|
||||
# Init script for falcon
|
||||
|
||||
self._clean_up()
|
||||
@ -113,28 +122,62 @@ class FalconCsaxs(Device):
|
||||
self.scan_number = 10 # scan_msg.content["info"]["scan_number"]
|
||||
self.exp_time = 0.5 # scan_msg.content["info"]["exp_time"]
|
||||
self.num_frames = 3 # scan_msg.content["info"]["num_points"]
|
||||
# TODO remove
|
||||
# TODO update service config for file path gen.. - But problem with path
|
||||
# self.username = self.device_manager.producer.get(MessageEndpoints.account()).decode()
|
||||
|
||||
self.destination_path = os.path.join(self.service_cfg["base_path"])
|
||||
self.filename = f"test_{self.scan_number}"
|
||||
self._prep_mca_acquisition()
|
||||
|
||||
# Filename to Redis
|
||||
path_to_file = self._file_template % (self.destination_path, self.filename)
|
||||
msg = BECMessage.FileMessage(file_path=path_to_file, done=False)
|
||||
self.producer.set_and_publish(
|
||||
MessageEndpoints.public_file(self.metadata["scanID"], self.name),
|
||||
msg.dumps(),
|
||||
)
|
||||
|
||||
# TODO BEC message on where file is going to be written to
|
||||
|
||||
return super().stage()
|
||||
|
||||
def acquire(self) -> None:
|
||||
self.start_all.set(1)
|
||||
|
||||
def unstage(self) -> List[object]:
|
||||
# Check number of acquisitions
|
||||
while not self._check_falcon_done():
|
||||
logger.info("Waiting for acquisition to finish, sleeping 0.1s ")
|
||||
time.sleep(0.1)
|
||||
# Compare expected vs measured number of pixel
|
||||
# logger.info(
|
||||
# f'Falcon: number of measured frames from expected {self.current_pixel.read()}/{self.pixels_per_run.read()}'
|
||||
# )
|
||||
# logger.info(
|
||||
# "Falcon write file state{self.hdf5.capture.read()}/{self.hdf5.writestatus}"
|
||||
# )
|
||||
# if not self.hdf5.write_status.read()[f'{self.name}_hdf5_write_status']['value'] :
|
||||
|
||||
self._clean_up()
|
||||
msg = BECMessage.FileMessage(file_path=path_to_file, done=True, successful=state)
|
||||
self.producer.set_and_publish(
|
||||
MessageEndpoints.public_file(self.metadata["scanID"], self.name),
|
||||
msg.dumps(),
|
||||
)
|
||||
|
||||
return super().unstage()
|
||||
|
||||
def _clean_up(self) -> None:
|
||||
"""Clean up"""
|
||||
self.hdf5.capture.set(0)
|
||||
self.stop_all.set(1)
|
||||
self.erase_all.set(1)
|
||||
|
||||
def _init_hdf5_saving(self) -> None:
|
||||
"""Set up hdf5 save parameters"""
|
||||
self.hdf5.enable.set(1) # EnableCallbacks
|
||||
self.hdf5.xml_file_name.set("layout.xml")
|
||||
self.hdf5.xml_file_name.set("layout.xml") # Points to hardcopy of HDF5 Layout xml file
|
||||
self.hdf5.lazy_open.set(1) # Yes -> To be checked how to add FilePlugin_V21+
|
||||
self.hdf5.temp_suffix.set("temps") # -> To be checked how to add FilePlugin_V22+
|
||||
self.hdf5.capture.set(0)
|
||||
|
||||
def _init_mapping_mode(self) -> None:
|
||||
"""Set up mapping mode params"""
|
||||
@ -152,9 +195,24 @@ class FalconCsaxs(Device):
|
||||
self.preset_real.set(self.exposure_time)
|
||||
self.pixels_per_run.set(self.num_frames)
|
||||
self.auto_pixels_per_buffer.set(0)
|
||||
self.pixels_per_buffer.set(16)
|
||||
self.pixels_per_buffer.set(self._value_pixel_per_buffer)
|
||||
|
||||
# HDF prep
|
||||
self.hdf5.file_path(self.destination_path)
|
||||
self.hdf5.file_name("falcon")
|
||||
self.hdf5.file_template("%sfalcon.h5")
|
||||
self.hdf5.file_path.set(self.destination_path)
|
||||
self.hdf5.file_name.set(self.filename)
|
||||
self.hdf5.file_template.set(self._file_template)
|
||||
self.hdf5.num_capture.set(self.num_frames // self._value_pixel_per_buffer + 1)
|
||||
self.hdf5.file_write_mode.set(2)
|
||||
self.hdf5.capture.set(1)
|
||||
|
||||
# Start acquisition
|
||||
# Check falcon status?? self.state --> 1 for acquiring.
|
||||
|
||||
def _check_falcon_done(self) -> bool:
|
||||
state = self.state.read()[f"{self.name }_state"]["value"]
|
||||
if state is [0, 1]:
|
||||
return not bool(state)
|
||||
else:
|
||||
# TODO raise error
|
||||
logger.warning("Returned in unknown state")
|
||||
return state
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user