From a49d64953ca45b97f2654b78976b7de3996e56f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20Kr=C3=BCger?= Date: Thu, 27 Apr 2023 16:47:19 +0200 Subject: [PATCH] MLZ/Entangle: Fix user limits handling The user limits should always inside the absolute limits. Change-Id: Ib678b52b6fd1e6badaec72a59eb18dc65a883c9e Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30970 Tested-by: Jenkins Automated Tests Reviewed-by: Enrico Faulhaber Reviewed-by: Jens Krueger --- frappy_mlz/entangle.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappy_mlz/entangle.py b/frappy_mlz/entangle.py index 10f47ce3..16783a74 100644 --- a/frappy_mlz/entangle.py +++ b/frappy_mlz/entangle.py @@ -555,7 +555,7 @@ class AnalogOutput(PyTangoDevice, Drivable): return self.abslimits[1] def __getusermin(self): - return self.userlimits[0] + return max(self.userlimits[0], self.abslimits[0]) def __setusermin(self, value): self.userlimits = (value, self.userlimits[1]) @@ -563,7 +563,7 @@ class AnalogOutput(PyTangoDevice, Drivable): usermin = property(__getusermin, __setusermin) def __getusermax(self): - return self.userlimits[1] + return min(self.userlimits[1], self.abslimits[1]) def __setusermax(self, value): self.userlimits = (self.userlimits[0], value)