From 7c3629529eacf3510dfd58ad0791345ec2da166a Mon Sep 17 00:00:00 2001 From: appleb_m Date: Tue, 9 Jun 2026 09:52:30 +0200 Subject: [PATCH] xo6da: added secondary beamline camera. --- src/aare/common/config/x06da.yaml | 5 +++-- src/aare/gui/main_window.py | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/aare/common/config/x06da.yaml b/src/aare/common/config/x06da.yaml index 547c9a6f..4af162f2 100644 --- a/src/aare/common/config/x06da.yaml +++ b/src/aare/common/config/x06da.yaml @@ -5,8 +5,9 @@ gui: sample_camera_zmq_url: "tcp://sls-gpu-003:9093" prediction_zmq_url: "tcp://sls-gpu-003:9093" beamline_camera_url: "x06da-axis-1.psi.ch" - gonio_camera_url: "axis-accc8ed2972e.psi.ch" - gonio_camera_id: "3" + secondary_beamline_camera_url: "axis-accc8e9a2995.psi.ch" + gonio_camera_url: "axis-server-es.psi.ch" + gonio_camera_id: "1" daq: daq_url: "http://mx-x06da-queue-01.psi.ch:5210" diff --git a/src/aare/gui/main_window.py b/src/aare/gui/main_window.py index 5d877667..3ccbcff9 100644 --- a/src/aare/gui/main_window.py +++ b/src/aare/gui/main_window.py @@ -268,6 +268,12 @@ class MainWindow(QMainWindow): self.video_tab.addTab(self.beamline_view_panel, "Beamline view") self.video_tab.addTab(self.beamline_combined_panel, "Beamline combined view") + if cfg_get("gui.cameras.secondary_beamline_camera_url", None): + self.secondary_beamline_view = VideoGraphicsView() + self.secondary_beamline_view_panel = AxisVideoPanel("Secondary view", self.secondary_beamline_view, parent=top_widget) + self.secondary_beamline_view_panel.refresh_requested.connect(self.refresh_axis_cameras) + self.video_tab.addTab(self.secondary_beamline_view_panel, "Secondary view") + top_widget_layout.addWidget(self.video_tab) self._start_axis_camera_threads()