From 55d20a0ed056b0f2855a89b14672d1ee8f3a99a7 Mon Sep 17 00:00:00 2001 From: Christian Appel Date: Fri, 20 Oct 2023 16:05:19 +0200 Subject: [PATCH] refactor: add _init function to all classes --- ophyd_devices/epics/devices/eiger9m_csaxs.py | 16 ++++++++-------- ophyd_devices/epics/devices/falcon_csaxs.py | 8 ++++---- ophyd_devices/epics/devices/pilatus_csaxs.py | 9 +++++---- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/ophyd_devices/epics/devices/eiger9m_csaxs.py b/ophyd_devices/epics/devices/eiger9m_csaxs.py index 049fdba..008b83b 100644 --- a/ophyd_devices/epics/devices/eiger9m_csaxs.py +++ b/ophyd_devices/epics/devices/eiger9m_csaxs.py @@ -42,7 +42,7 @@ class SlsDetectorCam(Device): bit_depth = ADCpt(EpicsSignalWithRBV, "BitDepth") num_cycles = ADCpt(EpicsSignalWithRBV, "NumCycles") num_frames = ADCpt(EpicsSignalWithRBV, "NumFrames") - timing_mode = ADCpt(EpicsSignalWithRBV, "TimingMode") + trigger_mode = ADCpt(EpicsSignalWithRBV, "TimingMode") trigger_software = ADCpt(EpicsSignal, "TriggerSoftware") acquire = ADCpt(EpicsSignal, "Acquire") detector_state = ADCpt(EpicsSignalRO, "DetectorState_RBV") @@ -151,16 +151,16 @@ class Eiger9mCsaxs(DetectorBase): self.scaninfo = BecScaninfoMixin(device_manager, sim_mode) self.scaninfo.load_scan_metadata() self.filewriter = FileWriterMixin(self.service_cfg) + self._init() - self.reduce_readout = 1e-3 # 3 ms - self.triggermode = 0 # 0 : internal, scan must set this if hardware triggered + #TODO function for abstract class? + def _init(self) -> None: + """Initialize detector, filewriter and set default parameters + """ + self.reduce_readout = 1e-3 self._init_eiger9m() self._init_standard_daq() - # self.mokev = self.device_manager.devices.mokev.read()[ - # self.device_manager.devices.mokev.name - # ]["value"] - def _init_eiger9m(self) -> None: """Init parameters for Eiger 9m""" self._set_trigger(TriggerSource.GATING) @@ -238,7 +238,7 @@ class Eiger9mCsaxs(DetectorBase): BURST_TRIGGER = 3 """ value = int(trigger_source) - self.cam.timing_mode.put(value) + self.cam.trigger_mode.put(value) def _prep_file_writer(self) -> None: self.filepath = self.filewriter.compile_full_filename( diff --git a/ophyd_devices/epics/devices/falcon_csaxs.py b/ophyd_devices/epics/devices/falcon_csaxs.py index f753110..bf85e32 100644 --- a/ophyd_devices/epics/devices/falcon_csaxs.py +++ b/ophyd_devices/epics/devices/falcon_csaxs.py @@ -177,12 +177,12 @@ class FalconCsaxs(Device): self.scaninfo = BecScaninfoMixin(device_manager, sim_mode) self.scaninfo.load_scan_metadata() self.filewriter = FileWriterMixin(self.service_cfg) - self._init_detector() + self._init() - def _init_detector(self) -> None: - """Set up detector parameters, init detector, init filewriter + def _init(self) -> None: + """Initialize detector, filewriter and set default parameters """ - self.readout = 0.003 # 3 ms + self.readout = 1e-3 self._value_pixel_per_buffer = 20 # 16 self._clean_up() self._init_hdf5_saving() diff --git a/ophyd_devices/epics/devices/pilatus_csaxs.py b/ophyd_devices/epics/devices/pilatus_csaxs.py index 61849f3..a857b0d 100644 --- a/ophyd_devices/epics/devices/pilatus_csaxs.py +++ b/ophyd_devices/epics/devices/pilatus_csaxs.py @@ -142,11 +142,12 @@ class PilatusCsaxs(DetectorBase): self.scaninfo = BecScaninfoMixin(device_manager, sim_mode) self.scaninfo.load_scan_metadata() self.filewriter = FileWriterMixin(self.service_cfg) - - self.readout = 1e-3 # 3 ms + self._init() - # TODO maybe needed - # self._close_file_writer() + def _init(self) -> None: + """Initialize detector, filewriter and set default parameters + """ + self.reduce_readout = 1e-3 def _get_current_scan_msg(self) -> BECMessage.ScanStatusMessage: msg = self.device_manager.producer.get(MessageEndpoints.scan_status())