From e00e7701f3d39aba6c89b71b5989493e2f367a1c Mon Sep 17 00:00:00 2001 From: appleb_m Date: Tue, 16 Jun 2026 12:09:51 +0200 Subject: [PATCH] config: remove ABR_POS_ALIGN_DEF and use ABR_POS_MOUNT instead --- src/aare/daq/config.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/aare/daq/config.py b/src/aare/daq/config.py index 4ef95a19..f7f85672 100644 --- a/src/aare/daq/config.py +++ b/src/aare/daq/config.py @@ -42,7 +42,6 @@ from aare.common.logger_config import setup_logger from aare.common.exception_handler import BeamlineBusyException #TODO WHAT SHOULD THIS BE? This should be in the YAMl file it is beamline specific -ABR_POS_ALIGN_DEF = AerotechCoordinate(at_mm=Coordinate(x=-18, y=-0.266, z=0)) ABR_POS_MOUNT = AerotechCoordinate( at_mm=Coordinate(x=0, y=0, z=0), omega_deg=0 @@ -797,7 +796,7 @@ class BeamlineConfig: def abr_meas_pos(self) -> AerotechCoordinate: tmp = self.__client.get(f"{self.__bl}:abr_meas_pos") if tmp is None: - return ABR_POS_ALIGN_DEF + return ABR_POS_MOUNT data_dict = json.loads(tmp) return AerotechCoordinate(**data_dict) @@ -1106,7 +1105,7 @@ class BeamlineConfig: def local_contact_links(self) -> dict[str, str | None]: detector_frontend = None smargon_frontend = cfg_get( - "daq.hardware.smargon_url", + "daq.hardware.smargon_frontend_url", f"http://{self.__mxb.name.lower()}-smargopolo.psi.ch:8080/", ) aerotech_frontend = cfg_get(