Closedown

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: