From acb8e6d0a1afaa8eea88881a2bd7d2c1e2b9c0b4 Mon Sep 17 00:00:00 2001 From: Enrico Faulhaber Date: Fri, 27 Jul 2018 15:01:34 +0200 Subject: [PATCH] [MLZ:entangle] fix windowtimeout condition was not 100% right. Change-Id: I189f0bb7f548d434dab9379727abd85ba0de58fa Reviewed-on: https://forge.frm2.tum.de/review/18540 Tested-by: JenkinsCodeReview Reviewed-by: Enrico Faulhaber --- secop_mlz/entangle.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/secop_mlz/entangle.py b/secop_mlz/entangle.py index 77ffb46..fe2cc0d 100644 --- a/secop_mlz/entangle.py +++ b/secop_mlz/entangle.py @@ -505,8 +505,8 @@ class AnalogOutput(PyTangoDevice, Drivable): max_in_hist = max(hist_in_window) min_in_hist = min(hist_in_window) - stable = max_in_hist - min_in_hist <= 2*self.precision - at_target = min_in_hist <= self.target <= max_in_hist + stable = max_in_hist - min_in_hist <= self.precision + at_target = max_in_hist - self.precision <= self.target <= min_in_hist + self.precision return stable and at_target