diff --git a/script/monitoring.py b/script/monitoring.py index b0bbd25c..40d5ad12 100644 --- a/script/monitoring.py +++ b/script/monitoring.py @@ -1,42 +1,38 @@ +print "Monitoring" +if controller.state == State.Ready and Scienta.state.isInitialized(): + scientaCurrentImageCount = Scienta.getCurrentImageCount() + _scientaRestart = False - -if controller.state != State.Ready or Scienta.state.isInitialized(): - return - - -scientaCurrentImageCount = Scienta.getCurrentImageCount() -_scientaRestart = False - -if currentImageCount>0: - #Criteria is: currentImageCount decreated - if globals.contains("scientaLastImageCount"): - if < scientaLastImageCount: - _scientaRestart = True -else: - #Criteria: first communication after timeout - try: + if scientaCurrentImageCount>0: + #Criteria is: currentImageCount decreated + if globals.contains("scientaLastImageCount"): + if scientaCurrentImageCount < scientaLastImageCount: + _scientaRestart = True + else: + #Criteria: first communication after timeout retries = 5 for i in range(retries): - try: - Scienta.getImageCounter.read() + try: + Scienta.getImageCounter().read() break except: - pass + pass if i>= retries-1: if globals.contains("scientaTimeOut"): if scientaTimeOut: _scientaRestart = True - scientaTimeOut = False - except: - scientaTimeOut = True - -if _scientaRestart: - print "Restarting Scienta..." - Scienta.initialize() - print "Finished Scienta restart..." - -scientaLastImageCount = scientaCurrentImageCount - - - + scientaTimeOut = False + else: + print "Scienta timeout" + scientaTimeOut = True + if _scientaRestart: + print "Restarting Scienta..." + Scienta.initialize() + print "Finished Scienta restart..." + + scientaLastImageCount = scientaCurrentImageCount + + + +