From 6fcf3bb243d736b7b6010d37a234adababd11052 Mon Sep 17 00:00:00 2001 From: x03daop Date: Thu, 8 Sep 2016 14:38:27 +0200 Subject: [PATCH] Closedown --- script/scan_guard.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script/scan_guard.py b/script/scan_guard.py index 7b059da5..bcc165ef 100644 --- a/script/scan_guard.py +++ b/script/scan_guard.py @@ -837,7 +837,9 @@ class ScanGuard(object): def mainloop(self): self._ringcurrent.pv.pend_io(timeout=0.01) - self.beam_ok = self.test or self.check_beam() + #self.beam_ok = self.test or self.check_beam() + self.beam_ok = true + self.test_start_seconds = time.time() self.running = True @@ -850,9 +852,7 @@ class ScanGuard(object): while self.running: self._ringcurrent.pv.poll() #pend_event(timeout=1) - new_beam_ok = self.check_beam() - logging.warning(str(new_beam_ok) + " - " + str(self.beam_ok) + "!") - + new_beam_ok = self.test or self.check_beam() if new_beam_ok != self.beam_ok: self.beam_ok = new_beam_ok if new_beam_ok: