From 6af440c97144cbb7cf64af88365a530bde59a1bb Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Mon, 11 Nov 2019 17:27:58 +0100 Subject: [PATCH] improve ppms simulation improvments on temp simulation Change-Id: I681e2a2fb7c556c2b73e969efa77ace13f0fc6ec Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21687 Tested-by: JenkinsCodeReview Reviewed-by: Markus Zolliker --- secop_psi/ppmssim.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/secop_psi/ppmssim.py b/secop_psi/ppmssim.py index 29c7d0c..8311b26 100755 --- a/secop_psi/ppmssim.py +++ b/secop_psi/ppmssim.py @@ -160,14 +160,19 @@ class PpmsSim: else: self.status.ch = self.chamber.target - if abs(self.t - self.temp.target) < 0.01: - self.status.t = 1 - elif abs(self.t - self.temp.target) < 0.1: - self.status.t = 5 - elif abs(self.t - self.temp.target) < 1: - self.status.t = 6 - else: - self.status.t = 2 + if 'TEMP' in self.changed: + self.changed.remove('TEMP') + self.status.t = 2 # changing + self.t_start = now + elif abs(self.t - self.temp.target) < 0.1: + if now > self.t_start + 10: + self.status.t = 1 # stable + else: + self.status.t = 5 # within tolerance + else: + self.t_start = now + if abs(self.t - self.temp.target) < 1: + self.status.t = 6 # outside tolerance if abs(self.pos - self.move.target) < 0.01: