Closedown

script/scan_guard.py

@@ -897,19 +897,19 @@ def main():
     guard.ringcurrent_dead_band = 1.0
     # True = block acquisition while beam is down, False = do not block (e.g. for He lamp measurements)
     guard.controls_active = True
-    # True = simulate beam down after a few seconds, False = normal operation
+    # True = simulate beam down after a few seconds, False = normal operation
+    guard.test = False
 
     global beam_ok
-    guard.connect()
     guard.connect()
+    try:
         guard.mainloop()
         beam_ok = True
+    except KeyboardInterrupt:
         logging.info("scan guard aborted by user")
         beam_ok = True
     except:
         print sys.exc_info()[1]
-
-    print "guard shutting down - measurements enabled"
 
     print "guard shutting down - measurements enabled"