Closedown

2016-09-08 14:38:27 +02:00
parent c129a4e666
commit 6fcf3bb243
1 changed files with 4 additions and 4 deletions
@@ -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: