From 002dba774245ea35b0ec90a8ede3fc91b30bbc4c Mon Sep 17 00:00:00 2001 From: David Perl Date: Thu, 20 Aug 2026 11:19:20 +0200 Subject: [PATCH] fix: save collimator positions --- src/aare/daq/server.py | 2 +- src/aare/devices/bec_worker.py | 3 ++- src/aare/gui/panels/local_contact_panel.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/aare/daq/server.py b/src/aare/daq/server.py index fcea2590..079e6872 100644 --- a/src/aare/daq/server.py +++ b/src/aare/daq/server.py @@ -714,7 +714,7 @@ async def bec_save_current_collimator_pos(token: str = Depends(oauth2_scheme)) - data = auth.parse_token(token) auth.check_jwt_staff_only(data) daq.bec_save_current_collimator_pos() - return {"ok": True, "message": "Saved current BEC collimator work position."} + return {"ok": True, "message": "Saved current BEC collimator 'in' positions."} @app.post("/bec/save_current_aerotech_position") diff --git a/src/aare/devices/bec_worker.py b/src/aare/devices/bec_worker.py index dc448069..d7ea6249 100644 --- a/src/aare/devices/bec_worker.py +++ b/src/aare/devices/bec_worker.py @@ -495,7 +495,8 @@ class BECClientWorker: self.macros.save_current_position(self.dev.bs_x, "in") def save_current_collimator_pos(self): - self.macros.save_current_position(self.dev.coll_y, "work") + self.macros.save_current_position(self.dev.coll_x, "in") + self.macros.save_current_position(self.dev.coll_y, "in") def save_current_aerotech_position(self): self.macros.save_current_position(self.dev.aerotech, "work", axis="x") diff --git a/src/aare/gui/panels/local_contact_panel.py b/src/aare/gui/panels/local_contact_panel.py index f216517d..600cd2cf 100644 --- a/src/aare/gui/panels/local_contact_panel.py +++ b/src/aare/gui/panels/local_contact_panel.py @@ -393,7 +393,7 @@ class LocalContactPanel(QFrame): ) device_config_layout.addWidget( self._make_button( - "Save current collimator position", + "Save current collimator position as x and y 'in'.", self._daq.bec_save_current_collimator_pos, "Saving current BEC collimator work position.", ) -- 2.54.0