Added @async and Hardware-Locking for center_to_beam

ufo-kit · Dec 12, 2013 · 13f397a · 13f397a
1 parent fa91ead
commit 13f397a
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/concert/processes.py b/concert/processes.py
@@ -489,6 +489,7 @@ def drift_to_beam(cam, xmotor, zmotor, pixelsize, tolerance=5,
         return False
 
 
+@async
 def center_to_beam(cam, xmotor, zmotor, pixelsize, xborder, zborder,
                    xstep=None, zstep=None, thres=1000, tolerance=5,
                    max_iterations=100):
@@ -505,18 +506,19 @@ def center_to_beam(cam, xmotor, zmotor, pixelsize, xborder, zborder,
     'center2beam(...)'.
     """
 
-    if not find_beam(cam, xmotor, zmotor, pixelsize, xborder, zborder,
-                     xstep, zstep, thres):
-        message = "Unable to find the beam"
-        LOG.debug('center_to_beam: '+message)
-        raise ProcessException(message)
-    else:
-        LOG.debug('center_to_beam: switch to drift_to_beam')
-        if not drift_to_beam(cam, xmotor, zmotor, pixelsize, tolerance,
-                             max_iterations):
-            message = "Maximum iterations reached"
+    with cam, xmotor, zmotor:
+        if not find_beam(cam, xmotor, zmotor, pixelsize, xborder, zborder,
+                         xstep, zstep, thres):
+            message = "Unable to find the beam"
             LOG.debug('center_to_beam: '+message)
             raise ProcessException(message)
+        else:
+            LOG.debug('center_to_beam: switch to drift_to_beam')
+            if not drift_to_beam(cam, xmotor, zmotor, pixelsize, tolerance,
+                                 max_iterations):
+                message = "Maximum iterations reached"
+                LOG.debug('center_to_beam: '+message)
+                raise ProcessException(message)
 
 
 class ProcessException(Exception):