Separated move_and_measure locks

This commit is contained in:
Joel Collins 2020-10-28 15:40:29 +00:00
parent ce57d37dc9
commit da490fdfcd

View file

@ -325,7 +325,7 @@ class MoveAndMeasureAPI(ActionView):
if microscope.has_real_stage(): if microscope.has_real_stage():
# Acquire microscope lock with 1s timeout # Acquire microscope lock with 1s timeout
with microscope.lock(timeout=1): with microscope.camera.lock, microscope.stage.lock:
return move_and_measure(microscope, dz=args.get("dz")) return move_and_measure(microscope, dz=args.get("dz"))
else: else: