mirror of
https://github.com/bec-project/ophyd_devices.git
synced 2025-06-24 11:41:09 +02:00
fix: format online changes via black
This commit is contained in:
@ -475,9 +475,7 @@ class DelayGeneratorDG645(Device):
|
|||||||
return status.set_finished()
|
return status.set_finished()
|
||||||
while True:
|
while True:
|
||||||
self.trigger_burst_readout.put(1, use_complete=True)
|
self.trigger_burst_readout.put(1, use_complete=True)
|
||||||
if (
|
if self.burst_cycle_finished.read()[self.burst_cycle_finished.name]["value"] == 1:
|
||||||
self.burst_cycle_finished.read()[self.burst_cycle_finished.name]["value"] == 1
|
|
||||||
):
|
|
||||||
self._acquisition_done = True
|
self._acquisition_done = True
|
||||||
status.set_finished()
|
status.set_finished()
|
||||||
return
|
return
|
||||||
@ -515,9 +513,9 @@ class DelayGeneratorDG645(Device):
|
|||||||
else:
|
else:
|
||||||
self.set_channels("width", self.trigger_width.get())
|
self.set_channels("width", self.trigger_width.get())
|
||||||
for value, channel in zip(self.fixed_ttl_width.get(), self._all_channels):
|
for value, channel in zip(self.fixed_ttl_width.get(), self._all_channels):
|
||||||
logger.info(f'{value}')
|
logger.info(f"{value}")
|
||||||
if value != 0:
|
if value != 0:
|
||||||
logger.info(f'Setting {value}')
|
logger.info(f"Setting {value}")
|
||||||
self.set_channels("width", value, channels=[channel])
|
self.set_channels("width", value, channels=[channel])
|
||||||
else:
|
else:
|
||||||
self._set_trigger(getattr(TriggerSource, self.set_trigger_source.get()))
|
self._set_trigger(getattr(TriggerSource, self.set_trigger_source.get()))
|
||||||
@ -555,9 +553,9 @@ class DelayGeneratorDG645(Device):
|
|||||||
else:
|
else:
|
||||||
self.set_channels("width", self.trigger_width.get())
|
self.set_channels("width", self.trigger_width.get())
|
||||||
for value, channel in zip(self.fixed_ttl_width.get(), self._all_channels):
|
for value, channel in zip(self.fixed_ttl_width.get(), self._all_channels):
|
||||||
logger.info(f'{value}')
|
logger.info(f"{value}")
|
||||||
if value != 0:
|
if value != 0:
|
||||||
logger.info(f'Setting {value}')
|
logger.info(f"Setting {value}")
|
||||||
self.set_channels("width", value, channels=[channel])
|
self.set_channels("width", value, channels=[channel])
|
||||||
else:
|
else:
|
||||||
# define parameters
|
# define parameters
|
||||||
|
@ -104,6 +104,7 @@ class Eiger9mCsaxs(DetectorBase):
|
|||||||
prefix (str): PV prefix (X12SA-ES-EIGER9M:)
|
prefix (str): PV prefix (X12SA-ES-EIGER9M:)
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
USER_ACCESS = [
|
USER_ACCESS = [
|
||||||
"describe",
|
"describe",
|
||||||
]
|
]
|
||||||
|
@ -257,7 +257,7 @@ class FalconCsaxs(Device):
|
|||||||
"""Function with 10s timeout"""
|
"""Function with 10s timeout"""
|
||||||
timer = 0
|
timer = 0
|
||||||
while True:
|
while True:
|
||||||
det_ctrl = self.state.read()[self.state.name]['value']
|
det_ctrl = self.state.read()[self.state.name]["value"]
|
||||||
writer_ctrl = self.hdf5.capture.get()
|
writer_ctrl = self.hdf5.capture.get()
|
||||||
received_frames = self.dxp.current_pixel.get()
|
received_frames = self.dxp.current_pixel.get()
|
||||||
total_frames = int(self.scaninfo.num_points * self.scaninfo.frames_per_trigger)
|
total_frames = int(self.scaninfo.num_points * self.scaninfo.frames_per_trigger)
|
||||||
|
@ -97,8 +97,7 @@ class SIS38XX(Device):
|
|||||||
|
|
||||||
|
|
||||||
class McsCsaxs(SIS38XX):
|
class McsCsaxs(SIS38XX):
|
||||||
USER_ACCESS = [
|
USER_ACCESS = ["_init_mcs"]
|
||||||
"_init_mcs"]
|
|
||||||
SUB_PROGRESS = "progress"
|
SUB_PROGRESS = "progress"
|
||||||
SUB_VALUE = "value"
|
SUB_VALUE = "value"
|
||||||
_default_sub = SUB_VALUE
|
_default_sub = SUB_VALUE
|
||||||
|
@ -216,9 +216,9 @@ class PilatusCsaxs(DetectorBase):
|
|||||||
# self._stop_file_writer()
|
# self._stop_file_writer()
|
||||||
# time.sleep(2)
|
# time.sleep(2)
|
||||||
self._close_file_writer()
|
self._close_file_writer()
|
||||||
time.sleep(.1)
|
time.sleep(0.1)
|
||||||
self._stop_file_writer()
|
self._stop_file_writer()
|
||||||
time.sleep(.1)
|
time.sleep(0.1)
|
||||||
|
|
||||||
self.filepath_h5 = self.filewriter.compile_full_filename(
|
self.filepath_h5 = self.filewriter.compile_full_filename(
|
||||||
self.scaninfo.scan_number, "pilatus_2.h5", 1000, 5, True
|
self.scaninfo.scan_number, "pilatus_2.h5", 1000, 5, True
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
from ophyd import Component as Cpt, EpicsSignal, EpicsSignalRO, Device
|
from ophyd import Component as Cpt, EpicsSignal, EpicsSignalRO, Device
|
||||||
|
|
||||||
|
|
||||||
class SequencerX12SA(Device):
|
class SequencerX12SA(Device):
|
||||||
"""Sequencer for flyscans with epics motor controller and owis stages
|
"""Sequencer for flyscans with epics motor controller and owis stages"""
|
||||||
"""
|
|
||||||
|
|
||||||
desired_output_link_1 = Cpt(Signal, "DOL1")
|
desired_output_link_1 = Cpt(Signal, "DOL1")
|
||||||
desired_output_value_1 = Cpt(EpicsSignal, "DO1")
|
desired_output_value_1 = Cpt(EpicsSignal, "DO1")
|
||||||
@ -20,7 +20,6 @@ class SequencerX12SA(Device):
|
|||||||
status = Cpt(EpicsSignalRO, "STAT", string=True)
|
status = Cpt(EpicsSignalRO, "STAT", string=True)
|
||||||
processing_active = Cpt(EpicsSignalRO, "PACT")
|
processing_active = Cpt(EpicsSignalRO, "PACT")
|
||||||
|
|
||||||
|
|
||||||
# def __init__(
|
# def __init__(
|
||||||
# self,
|
# self,
|
||||||
# prefix="",
|
# prefix="",
|
||||||
|
@ -692,7 +692,7 @@ class SGalilMotor(Device, PositionerBase):
|
|||||||
def stop(self, *, success=False):
|
def stop(self, *, success=False):
|
||||||
self.controller.stop_all_axes()
|
self.controller.stop_all_axes()
|
||||||
# last_speed = self.controller.socket_put_and_receive("MG")
|
# last_speed = self.controller.socket_put_and_receive("MG")
|
||||||
rtr = self.controller.socket_put_and_receive(f'SPC={2*10000}')
|
rtr = self.controller.socket_put_and_receive(f"SPC={2*10000}")
|
||||||
logger.info(f"{rtr}")
|
logger.info(f"{rtr}")
|
||||||
# logger.info(f'Motor stopped, restored speed for samy from {last_speed}mm/s to 2mm/s')
|
# logger.info(f'Motor stopped, restored speed for samy from {last_speed}mm/s to 2mm/s')
|
||||||
return super().stop(success=success)
|
return super().stop(success=success)
|
||||||
@ -712,8 +712,6 @@ class SGalilMotor(Device, PositionerBase):
|
|||||||
)
|
)
|
||||||
return status
|
return status
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def configure(
|
def configure(
|
||||||
self,
|
self,
|
||||||
parameter: dict,
|
parameter: dict,
|
||||||
@ -722,7 +720,6 @@ class SGalilMotor(Device, PositionerBase):
|
|||||||
self._kickoff_params = parameter
|
self._kickoff_params = parameter
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
mock = False
|
mock = False
|
||||||
if not mock:
|
if not mock:
|
||||||
|
Reference in New Issue
Block a user