From 2bd161cd63be138b35752aa8fa2229aeb6ad851c Mon Sep 17 00:00:00 2001 From: x01dc Date: Tue, 28 Jul 2026 10:46:41 +0200 Subject: [PATCH] config(devices): drop allied_vision_test.yaml, add commented example to ptycho_omny allied_vision_test.yaml was only ever a scratch config for exercising the camera during bring-up; the same commented allied_vision_cam example already lives in bl_detectors.yaml, so keep that one and add the matching commented block to ptycho_omny.yaml instead of a separate file. --- .../device_configs/allied_vision_test.yaml | 46 ------------------- csaxs_bec/device_configs/ptycho_omny.yaml | 13 ++++++ 2 files changed, 13 insertions(+), 46 deletions(-) delete mode 100644 csaxs_bec/device_configs/allied_vision_test.yaml diff --git a/csaxs_bec/device_configs/allied_vision_test.yaml b/csaxs_bec/device_configs/allied_vision_test.yaml deleted file mode 100644 index d9f7a40..0000000 --- a/csaxs_bec/device_configs/allied_vision_test.yaml +++ /dev/null @@ -1,46 +0,0 @@ -# eiger_1_5: -# description: Eiger 1.5M in-vacuum detector -# deviceClass: csaxs_bec.devices.jungfraujoch.eiger_1_5m.Eiger1_5M -# deviceConfig: -# detector_distance: 2150 -# beam_center: [860, 1219] -# onFailure: raise -# enabled: True -# readoutPriority: async -# softwareTrigger: False - -# eiger_9: -# description: Eiger 9M detector -# deviceClass: csaxs_bec.devices.jungfraujoch.eiger_9m.Eiger9M -# deviceConfig: -# detector_distance: 2200 -# beam_center: [870, 1203] -# onFailure: raise -# enabled: True -# readoutPriority: async -# softwareTrigger: False - -# ids_cam: -# description: IDS camera for live image acquisition -# deviceClass: csaxs_bec.devices.ids_cameras.IDSCamera -# deviceConfig: -# camera_id: 201 -# bits_per_pixel: 24 -# m_n_colormode: 1 -# live_mode: True -# onFailure: raise -# enabled: true -# readoutPriority: async -# softwareTrigger: True - -allied_vision_cam: - description: AlliedVision Alvium G1-507m camera for live image acquisition (native Aravis/GigE Vision, no EPICS IOC) - deviceClass: csaxs_bec.devices.allied_vision_cameras.AlliedVisionAravisCamera - deviceConfig: - camera_id: "Allied Vision-Alvium G1-507m-06J41" # Aravis device ID; resolved via discovery, independent of current IP - live_mode: False - onFailure: raise - enabled: true - readoutPriority: async - softwareTrigger: True - diff --git a/csaxs_bec/device_configs/ptycho_omny.yaml b/csaxs_bec/device_configs/ptycho_omny.yaml index ebdfa1e..03edf18 100755 --- a/csaxs_bec/device_configs/ptycho_omny.yaml +++ b/csaxs_bec/device_configs/ptycho_omny.yaml @@ -61,6 +61,19 @@ cam203: deviceTags: - ptycho_omny +# allied_vision_cam: +# description: AlliedVision Alvium G1-507m camera for live image acquisition (native Aravis/GigE Vision, no EPICS IOC) +# deviceClass: csaxs_bec.devices.allied_vision_cameras.AlliedVisionAravisCamera +# deviceConfig: +# camera_id: "Allied Vision-Alvium G1-507m-06J41" # Aravis device ID; resolved via discovery, independent of current IP +# live_mode: True +# onFailure: raise +# enabled: true +# readoutPriority: async +# softwareTrigger: True +# deviceTags: +# - ptycho_omny + ############################################################ #################### OMNY RT motors ######################## ############################################################