From 3e91fcfcfc2b6cc02f1d655992a24cb5c398d7e0 Mon Sep 17 00:00:00 2001
From: x03daop <x03daop@x03da-cons-1.psi.ch>
Date: Fri, 4 Nov 2016 15:49:29 +0100
Subject: [PATCH] Closedown

---
 script/monitoring.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/script/monitoring.py b/script/monitoring.py
index 40d5ad12..3e5248aa 100644
--- a/script/monitoring.py
+++ b/script/monitoring.py
@@ -5,7 +5,7 @@ if controller.state == State.Ready and Scienta.state.isInitialized():
     
     if scientaCurrentImageCount>0:
         #Criteria is: currentImageCount decreated
-        if globals.contains("scientaLastImageCount"):   
+        if globals.has_key("scientaLastImageCount"):   
             if  scientaCurrentImageCount < scientaLastImageCount:
                 _scientaRestart = True            
     else:
@@ -16,14 +16,15 @@ if controller.state == State.Ready and Scienta.state.isInitialized():
                 Scienta.getImageCounter().read()
                 break
             except:
-                pass            
-        if i>= retries-1:
-            if globals.contains("scientaTimeOut"):
+                pass                      
+        if i < retries-1:
+            #Communication ok
+            if globals.has_key("scientaTimeOut"):
                 if scientaTimeOut:
                     _scientaRestart = True            
             scientaTimeOut = False
-        else:
-            print "Scienta timeout"
+        else: 
+            print "Scienta timeout"           
             scientaTimeOut = True
 
     if _scientaRestart: