linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MLZ/Entangle: Fix user limits handling

Browse Source 
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 <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Jens Krueger <jens.krueger@frm2.tum.de>
This commit is contained in:
Jens Krüger
2023-04-27 16:47:19 +02:00
committed by Jens Krueger
parent 507a941459
commit a49d64953c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frappy_mlz/entangle.py
View File

@ -555,7 +555,7 @@ class AnalogOutput(PyTangoDevice, Drivable):
return self.abslimits[1] return self.abslimits[1]
def __getusermin(self): def __getusermin(self):
return self.userlimits[0] return max(self.userlimits[0], self.abslimits[0])
def __setusermin(self, value): def __setusermin(self, value):
self.userlimits = (value, self.userlimits[1]) self.userlimits = (value, self.userlimits[1])
@ -563,7 +563,7 @@ class AnalogOutput(PyTangoDevice, Drivable):
usermin = property(__getusermin, __setusermin) usermin = property(__getusermin, __setusermin)
def __getusermax(self): def __getusermax(self):
return self.userlimits[1] return min(self.userlimits[1], self.abslimits[1])
def __setusermax(self, value): def __setusermax(self, value):
self.userlimits = (self.userlimits[0], value) self.userlimits = (self.userlimits[0], value)