fix: save collimator positions
CI / lint (pull_request) Successful in 41s
CI / test (3.11) (pull_request) Successful in 1m6s
CI / test (3.12) (pull_request) Successful in 1m4s
CI / test (3.13) (pull_request) Successful in 1m6s
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Successful in 1m15s
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Successful in 1m20s
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Successful in 1m19s
CI / test-with-coverage (pull_request) Successful in 1m40s
CI / coverage-analysis (pull_request) Failing after 3s
CI / lint (push) Successful in 31s
Docs build and publish / docker (push) Successful in 14s
CI / test (3.11) (push) Canceled after 38s
CI / test (3.12) (push) Canceled after 33s
CI / test (3.13) (push) Canceled after 33s
CI / test-with-beamline-plugins (pxi_bec) (push) Canceled after 28s
CI / test-with-beamline-plugins (pxii_bec) (push) Canceled after 28s
CI / test-with-beamline-plugins (pxiii_bec) (push) Canceled after 23s
CI / test-with-coverage (push) Canceled after 23s
CI / coverage-analysis (push) Canceled after 0s
Build and Publish / release (push) Successful in 23s

This commit was merged in pull request #149.
This commit is contained in:
2026-08-20 11:19:20 +02:00
parent ffff1e8c2d
commit 002dba7742
3 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -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")
+2 -1
View File
@@ -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")
+1 -1
View File
@@ -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.",
)