config: remove ABR_POS_ALIGN_DEF and use ABR_POS_MOUNT instead
This commit is contained in:
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user