From 2e82ae5cf5a15e51f6c1e9257a5261e8cb27817e Mon Sep 17 00:00:00 2001
From: x03daop <x03daop@x03da-cons-1.psi.ch>
Date: Fri, 4 Nov 2016 16:09:21 +0100
Subject: [PATCH] Closedown

---
 script/monitoring.py | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/script/monitoring.py b/script/monitoring.py
index c467119e..45ac5a45 100644
--- a/script/monitoring.py
+++ b/script/monitoring.py
@@ -14,20 +14,18 @@ if controller.state == State.Ready and Scienta.state.isInitialized():
         for i in range(retries):
             try:                    
                 Scienta.getImageCounter().read()
+                print "Communication ok"           
+                if globals().has_key("scientaTimeOut"):
+                    if scientaTimeOut:
+                        _scientaRestart = True            
+                scientaTimeOut = False
                 break
             except:
-                print "Com failure: retrying"
-                pass                      
-        if i < retries-1:
-            #Communication ok
-            print "Communication ok"           
-            if globals().has_key("scientaTimeOut"):
-                if scientaTimeOut:
-                    _scientaRestart = True            
-            scientaTimeOut = False
-        else: 
-            print "Scienta timeout"           
-            scientaTimeOut = True
+                if i < retries-1:
+                    print "Com failure: retrying"
+                else
+                    print "Scienta timeout"           
+                    scientaTimeOut = True                   
 
     if _scientaRestart:
         print "Restarting Scienta..."