From d748c7312d26ddec9705fe54e3416aed902aa917 Mon Sep 17 00:00:00 2001 From: Mirko Holler Date: Thu, 5 Nov 2026 15:05:38 +0100 Subject: [PATCH] fix(omny): laser tracker on with mirror 7 (FZP X) instead of 6 (OSA X, unused since the interferometer rework); RotX mirror keeps the RotZ settings (Mirko) Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01M8zoDvEVcT4jbFjSNU9Rii --- csaxs_bec/bec_ipython_client/plugins/omny/omny_rt.py | 2 +- csaxs_bec/devices/omny/rt/rt_omny_ophyd.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/csaxs_bec/bec_ipython_client/plugins/omny/omny_rt.py b/csaxs_bec/bec_ipython_client/plugins/omny/omny_rt.py index f128598a..84df13e5 100644 --- a/csaxs_bec/bec_ipython_client/plugins/omny/omny_rt.py +++ b/csaxs_bec/bec_ipython_client/plugins/omny/omny_rt.py @@ -154,7 +154,7 @@ class OMNY_rt_client: print( f"\nSelected mirror channel {self.mirror_channel}: {opt_mirrorname}. Autostop {autostop}. Signal averaging time: {averaging_time}\r" ) - if int(key) == 6: + if int(key) == 7: # FZP X (ST FZP X); was 6 = OSA X before the interferometer rework (Mirko 2026-11-05) dev.rtx.controller.laser_tracker_on() dev.rtx.controller._omny_interferometer_switch_channel(self.mirror_channel) max = 0 diff --git a/csaxs_bec/devices/omny/rt/rt_omny_ophyd.py b/csaxs_bec/devices/omny/rt/rt_omny_ophyd.py index 82b0833a..9248e905 100644 --- a/csaxs_bec/devices/omny/rt/rt_omny_ophyd.py +++ b/csaxs_bec/devices/omny/rt/rt_omny_ophyd.py @@ -111,7 +111,7 @@ class RtOMNYController(Controller): self.switchbox_socket = socket.socket() # Interferometer rework 2026-11-05 (Mirko): signals ssi_1 ST FZP Y, ssi_2 ST FZP X, ssi_3 RotZ, ssi_4 RotX, # ssi_5 not read. Mirror (switchbox) channels: 1 Inc Angle (RotZ, ssi_3), 2 Inc ST FZP Y (was Inc ST OSA Y, - # ssi_1), 3 Inc RotX (new angle interferometer, ssi_4; thresholds provisional from channel 1), 4 unused (was + # ssi_1), 3 Inc RotX (new angle interferometer, ssi_4; same settings as channel 1 RotZ until its signals are known), 4 unused (was # OSA Y), 5 FZP Y (ssi_1), 6 unused (was OSA X), 7 FZP X (ssi_2), 8 unused (was OSA Y on the OSA FZP signal). self.mirror_parameters = { 1: {