From e20cb519a76d196450f02b190051ec1b9702d0a5 Mon Sep 17 00:00:00 2001 From: Pete Jemian Date: Thu, 24 Jan 2019 16:11:14 -0600 Subject: [PATCH] #59 these are motors, not just signals --- profile_bluesky/startup/43-procedures.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/profile_bluesky/startup/43-procedures.py b/profile_bluesky/startup/43-procedures.py index 1895ac16..442c4b2b 100644 --- a/profile_bluesky/startup/43-procedures.py +++ b/profile_bluesky/startup/43-procedures.py @@ -154,11 +154,11 @@ def mode_WAXS(): yield from bps.sleep(0.5) while max(v_diff, h_diff) > 0.02: # FIXME: What good is this loop? yield from bps.sleep(0.5) - v_diff = abs((guard_slit.top.value-guard_slit.bot.value) - terms.SAXS.guard_v_size.value) - h_diff = abs((guard_slit.outb.value-guard_slit.inb.value) - terms.SAXS.guard_h_size.value) + v_diff = abs((guard_slit.top.position - guard_slit.bot.position) - terms.SAXS.guard_v_size.value) + h_diff = abs((guard_slit.outb.position - guard_slit.inb.position) - terms.SAXS.guard_h_size.value) - v_diff = abs(usaxs_slit.v_size.value - terms.SAXS.v_size.value) - h_diff = abs(usaxs_slit.h_size.value - terms.SAXS.h_size.value) + v_diff = abs(usaxs_slit.v_size.position - terms.SAXS.v_size.value) + h_diff = abs(usaxs_slit.h_size.position - terms.SAXS.h_size.value) if max(v_diff, h_diff) > 0.02: logger.info("Moving Beam defining slits") yield from bps.mv(