diff --git a/debye_bec/devices/cameras/basler_cam.py b/debye_bec/devices/cameras/basler_cam.py index 2c576fb..c526e8d 100644 --- a/debye_bec/devices/cameras/basler_cam.py +++ b/debye_bec/devices/cameras/basler_cam.py @@ -1,29 +1,31 @@ -from ophyd_devices.devices.areadetector.cam import ProsilicaDetectorCam +from ophyd_devices.devices.areadetector.cam import AravisDetectorCam from ophyd_devices.devices.areadetector.plugins import ImagePlugin_V35 from ophyd_devices.interfaces.base_classes.psi_device_base import PSIDeviceBase -from ophyd import Component as Cpt from ophyd import ADComponent as ADCpt -from ophyd import Device, ADBase +from ophyd import ADBase, Kind +# from ophyd_devices.sim.sim_signals import SetableSignal +# from ophyd_devices.utils.psi_component import PSIComponent, SignalType import numpy as np -class BaslerDetectorCam(ProsilicaDetectorCam): - - ps_bad_frame_counter = None class BaslerCamBase(ADBase): - cam1 = ADCpt(BaslerDetectorCam, "cam1:") + cam1 = ADCpt(AravisDetectorCam, "cam1:") image1 = ADCpt(ImagePlugin_V35, 'image1:') class BaslerCam(PSIDeviceBase, BaslerCamBase): + + # preview_2d = PSIComponent(SetableSignal, signal_type=SignalType.PREVIEW, ndim=2, kind=Kind.omitted) + def emit_to_bec(self, *args, obj=None, old_value=None, value=None, **kwargs): width = self.image1.array_size.width.get() height = self.image1.array_size.height.get() data = np.reshape(value, (height,width)) + # self.preview_2d.put(data) self._run_subs(sub_type=self.SUB_DEVICE_MONITOR_2D, value=data) def on_connected(self):