bec/ophyd_devices
0
0
Fork 0
mirror of https://github.com/bec-project/ophyd_devices.git synced 2025-06-26 20:51:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed formatting

Browse Source
This commit is contained in:
appel_c
2023-09-27 11:39:05 +02:00
parent 712674e4b8
commit 48445e8b61
5 changed files with 75 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ophyd_devices/epics/devices/DelayGeneratorDG645.py
View File

@ -599,7 +599,7 @@ class DelayGeneratorDG645(Device):
super().unstage() super().unstage()
def pre_scan(self) -> None: def pre_scan(self) -> None:
if self.premove_trigger.get()==True: if self.premove_trigger.get() == True:
self.trigger_shot.put(1) self.trigger_shot.put(1)
def trigger(self) -> DeviceStatus: def trigger(self) -> DeviceStatus:

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

@ -30,42 +30,42 @@ class EigerTimeoutError(Exception):
class SlsDetectorCam(Device): class SlsDetectorCam(Device):
detector_type = ADCpt(EpicsSignalRO, "DetectorType_RBV") # detector_type = ADCpt(EpicsSignalRO, "DetectorType_RBV")
setting = ADCpt(EpicsSignalWithRBV, "Setting") # setting = ADCpt(EpicsSignalWithRBV, "Setting")
delay_time = ADCpt(EpicsSignalWithRBV, "DelayTime") # delay_time = ADCpt(EpicsSignalWithRBV, "DelayTime")
threshold_energy = ADCpt(EpicsSignalWithRBV, "ThresholdEnergy") threshold_energy = ADCpt(EpicsSignalWithRBV, "ThresholdEnergy")
beam_energy = ADCpt(EpicsSignalWithRBV, "BeamEnergy") beam_energy = ADCpt(EpicsSignalWithRBV, "BeamEnergy")
enable_trimbits = ADCpt(EpicsSignalWithRBV, "Trimbits") # enable_trimbits = ADCpt(EpicsSignalWithRBV, "Trimbits")
bit_depth = ADCpt(EpicsSignalWithRBV, "BitDepth") bit_depth = ADCpt(EpicsSignalWithRBV, "BitDepth")
num_gates = ADCpt(EpicsSignalWithRBV, "NumGates") # num_gates = ADCpt(EpicsSignalWithRBV, "NumGates")
num_cycles = ADCpt(EpicsSignalWithRBV, "NumCycles") num_cycles = ADCpt(EpicsSignalWithRBV, "NumCycles")
num_frames = ADCpt(EpicsSignalWithRBV, "NumFrames") num_frames = ADCpt(EpicsSignalWithRBV, "NumFrames")
timing_mode = ADCpt(EpicsSignalWithRBV, "TimingMode") timing_mode = ADCpt(EpicsSignalWithRBV, "TimingMode")
trigger_software = ADCpt(EpicsSignal, "TriggerSoftware") trigger_software = ADCpt(EpicsSignal, "TriggerSoftware")
high_voltage = ADCpt(EpicsSignalWithRBV, "HighVoltage") # high_voltage = ADCpt(EpicsSignalWithRBV, "HighVoltage")
# Receiver and data callback # Receiver and data callback
receiver_mode = ADCpt(EpicsSignalWithRBV, "ReceiverMode") # receiver_mode = ADCpt(EpicsSignalWithRBV, "ReceiverMode")
receiver_stream = ADCpt(EpicsSignalWithRBV, "ReceiverStream") # receiver_stream = ADCpt(EpicsSignalWithRBV, "ReceiverStream")
enable_data = ADCpt(EpicsSignalWithRBV, "UseDataCallback") # enable_data = ADCpt(EpicsSignalWithRBV, "UseDataCallback")
missed_packets = ADCpt(EpicsSignalRO, "ReceiverMissedPackets_RBV") # missed_packets = ADCpt(EpicsSignalRO, "ReceiverMissedPackets_RBV")
# Direct settings access # Direct settings access
setup_file = ADCpt(EpicsSignal, "SetupFile") # setup_file = ADCpt(EpicsSignal, "SetupFile")
load_setup = ADCpt(EpicsSignal, "LoadSetup") # load_setup = ADCpt(EpicsSignal, "LoadSetup")
command = ADCpt(EpicsSignal, "Command") # command = ADCpt(EpicsSignal, "Command")
# Mythen 3 # Mythen 3
counter_mask = ADCpt(EpicsSignalWithRBV, "CounterMask") # counter_mask = ADCpt(EpicsSignalWithRBV, "CounterMask")
counter1_threshold = ADCpt(EpicsSignalWithRBV, "Counter1Threshold") # counter1_threshold = ADCpt(EpicsSignalWithRBV, "Counter1Threshold")
counter2_threshold = ADCpt(EpicsSignalWithRBV, "Counter2Threshold") # counter2_threshold = ADCpt(EpicsSignalWithRBV, "Counter2Threshold")
counter3_threshold = ADCpt(EpicsSignalWithRBV, "Counter3Threshold") # counter3_threshold = ADCpt(EpicsSignalWithRBV, "Counter3Threshold")
gate1_delay = ADCpt(EpicsSignalWithRBV, "Gate1Delay") # gate1_delay = ADCpt(EpicsSignalWithRBV, "Gate1Delay")
gate1_width = ADCpt(EpicsSignalWithRBV, "Gate1Width") # gate1_width = ADCpt(EpicsSignalWithRBV, "Gate1Width")
gate2_delay = ADCpt(EpicsSignalWithRBV, "Gate2Delay") # gate2_delay = ADCpt(EpicsSignalWithRBV, "Gate2Delay")
gate2_width = ADCpt(EpicsSignalWithRBV, "Gate2Width") # gate2_width = ADCpt(EpicsSignalWithRBV, "Gate2Width")
gate3_delay = ADCpt(EpicsSignalWithRBV, "Gate3Delay") # gate3_delay = ADCpt(EpicsSignalWithRBV, "Gate3Delay")
gate3_width = ADCpt(EpicsSignalWithRBV, "Gate3Width") # gate3_width = ADCpt(EpicsSignalWithRBV, "Gate3Width")
# Moench # # Moench
json_frame_mode = ADCpt(EpicsSignalWithRBV, "JsonFrameMode") # json_frame_mode = ADCpt(EpicsSignalWithRBV, "JsonFrameMode")
json_detector_mode = ADCpt(EpicsSignalWithRBV, "JsonDetectorMode") # json_detector_mode = ADCpt(EpicsSignalWithRBV, "JsonDetectorMode")
# fixes due to missing PVs from CamBase # fixes due to missing PVs from CamBase
acquire = ADCpt(EpicsSignal, "Acquire") acquire = ADCpt(EpicsSignal, "Acquire")
@ -170,7 +170,7 @@ class Eiger9mCsaxs(DetectorBase):
def _init_eiger9m(self) -> None: def _init_eiger9m(self) -> None:
"""Init parameters for Eiger 9m""" """Init parameters for Eiger 9m"""
self._set_trigger(TriggerSource.GATING) self._set_trigger(TriggerSource.GATING)
self.cam.acquire.set(0) self.stop_acquisition()
def _update_std_cfg(self, cfg_key: str, value: Any) -> None: def _update_std_cfg(self, cfg_key: str, value: Any) -> None:
cfg = self.std_client.get_config() cfg = self.std_client.get_config()
@ -301,16 +301,10 @@ class Eiger9mCsaxs(DetectorBase):
msg.dumps(), msg.dumps(),
) )
self.arm_acquisition() self.arm_acquisition()
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")
self._stopped = False self._stopped = False
# We see that we miss a trigger occasionally, it seems that status msg from the ioc are not realiable
time.sleep(0.05)
return super().stage() return super().stage()
@threadlocked @threadlocked
@ -343,6 +337,7 @@ class Eiger9mCsaxs(DetectorBase):
timer = 0 timer = 0
while True: while True:
det_ctrl = self.cam.acquire.read()[self.cam.acquire.name]["value"] det_ctrl = self.cam.acquire.read()[self.cam.acquire.name]["value"]
# det_ctrl = 0
std_ctrl = self.std_client.get_status()["acquisition"]["state"] std_ctrl = self.std_client.get_status()["acquisition"]["state"]
status = self.std_client.get_status() status = self.std_client.get_status()
received_frames = status["acquisition"]["stats"]["n_write_completed"] received_frames = status["acquisition"]["stats"]["n_write_completed"]
@ -351,6 +346,7 @@ class Eiger9mCsaxs(DetectorBase):
if det_ctrl == 0 and std_ctrl == "FINISHED" and total_frames == received_frames: if det_ctrl == 0 and std_ctrl == "FINISHED" and total_frames == received_frames:
break break
if self._stopped == True: if self._stopped == True:
self.stop_acquisition()
self._close_file_writer() self._close_file_writer()
break break
time.sleep(0.1) time.sleep(0.1)
@ -358,6 +354,7 @@ class Eiger9mCsaxs(DetectorBase):
if timer > 5: if timer > 5:
self._stopped == True self._stopped == True
self._close_file_writer() self._close_file_writer()
self.stop_acquisition()
raise EigerTimeoutError( raise EigerTimeoutError(
f"Reached timeout with detector state {det_ctrl}, std_daq state {std_ctrl} and received frames of {received_frames} for the file writer" f"Reached timeout with detector state {det_ctrl}, std_daq state {std_ctrl} and received frames of {received_frames} for the file writer"
) )
@ -367,11 +364,41 @@ class Eiger9mCsaxs(DetectorBase):
"""Start acquisition in software trigger mode, """Start acquisition in software trigger mode,
or arm the detector in hardware of the detector or arm the detector in hardware of the detector
""" """
self.cam.acquire.set(1) 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")
elapsed_time = 0
sleep_time = 0.01
self.cam.acquire.put(0)
retry = False
while True:
det_ctrl = self.cam.detector_state.read()[self.cam.detector_state.name]["value"]
if det_ctrl == int(DetectorState.IDLE):
break
if self._stopped == True:
break
time.sleep(sleep_time)
elapsed_time += sleep_time
if elapsed_time > 2 and not retry:
retry = True
self.cam.acquire.put(0)
if elapsed_time > 5:
raise EigerTimeoutError("Failed to stop the acquisition. IOC did not update.")
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.cam.acquire.set(0) self.stop_acquisition()
self._close_file_writer() self._close_file_writer()
super().stop(success=success) super().stop(success=success)
self._stopped = True self._stopped = True

12
ophyd_devices/epics/devices/falcon_csaxs.py
View File

@ -65,8 +65,8 @@ class FalconHDF5Plugins(Device): # HDF5Plugin_V21, FilePlugin_V22):
file_template = Cpt(EpicsSignalWithRBV, "FileTemplate", string=True, kind="config") file_template = Cpt(EpicsSignalWithRBV, "FileTemplate", string=True, kind="config")
num_capture = Cpt(EpicsSignalWithRBV, "NumCapture", kind="config") num_capture = Cpt(EpicsSignalWithRBV, "NumCapture", kind="config")
file_write_mode = Cpt(EpicsSignalWithRBV, "FileWriteMode", kind="config") file_write_mode = Cpt(EpicsSignalWithRBV, "FileWriteMode", kind="config")
queue_size = Cpt(EpicsSignalWithRBV, "QueueSize", kind="config") queue_size = Cpt(EpicsSignalWithRBV, "QueueSize", kind="config")
array_counter = Cpt(EpicsSignalWithRBV, "ArrayCounter", kind="config") array_counter = Cpt(EpicsSignalWithRBV, "ArrayCounter", kind="config")
class FalconCsaxs(Device): class FalconCsaxs(Device):
@ -183,8 +183,8 @@ class FalconCsaxs(Device):
self.collect_mode.put(1) self.collect_mode.put(1)
self.preset_real.put(self.scaninfo.exp_time) self.preset_real.put(self.scaninfo.exp_time)
self.pixels_per_run.put(int(self.scaninfo.num_points * self.scaninfo.frames_per_trigger)) self.pixels_per_run.put(int(self.scaninfo.num_points * self.scaninfo.frames_per_trigger))
#self.auto_pixels_per_buffer.put(0) # self.auto_pixels_per_buffer.put(0)
#self.pixels_per_buffer.put(self._value_pixel_per_buffer) # self.pixels_per_buffer.put(self._value_pixel_per_buffer)
def _prep_file_writer(self) -> None: def _prep_file_writer(self) -> None:
"""Prep HDF5 weriting""" """Prep HDF5 weriting"""
@ -276,7 +276,9 @@ class FalconCsaxs(Device):
time.sleep(0.1) time.sleep(0.1)
timer += 0.1 timer += 0.1
if timer > 5: if timer > 5:
logger.info(f'Falcon missed a trigger: received trigger {received_frames}, send data {written_frames} from total_frames {total_frames}') logger.info(
f"Falcon missed a trigger: received trigger {received_frames}, send data {written_frames} from total_frames {total_frames}"
)
break break
# raise FalconTimeoutError # raise FalconTimeoutError
# f"Reached timeout with detector state {det_ctrl}, falcon state {writer_ctrl}, received trigger {received_frames} and files written {written_frames}" # f"Reached timeout with detector state {det_ctrl}, falcon state {writer_ctrl}, received trigger {received_frames} and files written {written_frames}"

2
ophyd_devices/epics/devices/mcs_csaxs.py
View File

@ -295,7 +295,7 @@ class McsCsaxs(SIS38XX):
def _set_acquisition_params(self) -> None: def _set_acquisition_params(self) -> None:
if self.scaninfo.scan_type == "step": if self.scaninfo.scan_type == "step":
self.n_points = int(self.scaninfo.frames_per_trigger)*int(self.scaninfo.num_points) self.n_points = int(self.scaninfo.frames_per_trigger) * int(self.scaninfo.num_points)
elif self.scaninfo.scan_type == "fly": elif self.scaninfo.scan_type == "fly":
self.n_points = int(self.scaninfo.num_points) # / int(self.num_lines.get())) self.n_points = int(self.scaninfo.num_points) # / int(self.num_lines.get()))
else: else:

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

@ -413,7 +413,7 @@ class PilatusCsaxs(DetectorBase):
# # ) # # )
self._stop_file_writer() self._stop_file_writer()
time.sleep(.5) time.sleep(0.5)
self._close_file_writer() self._close_file_writer()
def acquire(self) -> None: def acquire(self) -> None: