From cb16dcfb4c2101c822849ffdf7f75c0efdeb3597 Mon Sep 17 00:00:00 2001 From: Holler Mirko Date: Tue, 24 Sep 2024 08:25:21 +0200 Subject: [PATCH] multiple cameras and fix cam id --- csaxs_bec/device_configs/omny_config.yaml | 43 ++++++++++++++++++++- csaxs_bec/devices/ids_cameras/ids_camera.py | 2 +- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/csaxs_bec/device_configs/omny_config.yaml b/csaxs_bec/device_configs/omny_config.yaml index 4350bd1..59de2d6 100644 --- a/csaxs_bec/device_configs/omny_config.yaml +++ b/csaxs_bec/device_configs/omny_config.yaml @@ -1,8 +1,34 @@ ############################################################ #################### IDS Camera ###################### ############################################################ -cam1: - description: Camera1 +cam200: + description: Camera200 + deviceClass: csaxs_bec.devices.ids_cameras.ids_camera.IDSCamera + deviceConfig: + camera_ID: 200 + bits_per_pixel: 24 + channels: 3 + m_n_colormode: 1 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: async + +cam201: + description: Camera201 + deviceClass: csaxs_bec.devices.ids_cameras.ids_camera.IDSCamera + deviceConfig: + camera_ID: 201 + bits_per_pixel: 24 + channels: 3 + m_n_colormode: 1 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: async + +cam202: + description: Camera202 deviceClass: csaxs_bec.devices.ids_cameras.ids_camera.IDSCamera deviceConfig: camera_ID: 202 @@ -14,6 +40,19 @@ cam1: readOnly: false readoutPriority: async +cam203: + description: Camera203 + deviceClass: csaxs_bec.devices.ids_cameras.ids_camera.IDSCamera + deviceConfig: + camera_ID: 203 + bits_per_pixel: 24 + channels: 3 + m_n_colormode: 1 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: async + # ############################################################ # #################### flOMNI RT motors ###################### # ############################################################ diff --git a/csaxs_bec/devices/ids_cameras/ids_camera.py b/csaxs_bec/devices/ids_cameras/ids_camera.py index c6cbdbf..e88dfad 100644 --- a/csaxs_bec/devices/ids_cameras/ids_camera.py +++ b/csaxs_bec/devices/ids_cameras/ids_camera.py @@ -22,7 +22,7 @@ class IDSCustomPrepare(CustomDetectorMixin): def on_connection_established(self): - self.hCam = self.ueye.HIDS(202) #0: first available camera; 1-254: The camera with the specified camera ID + self.hCam = self.ueye.HIDS(self.parent.camera_ID) #0: first available camera; 1-254: The camera with the specified camera ID self.sInfo = self.ueye.SENSORINFO() self.cInfo = self.ueye.CAMINFO() self.pcImageMemory = self.ueye.c_mem_p()