From 502db5fd34bb3e724e4cf039432244ed378aa71f Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Fri, 31 Jan 2020 11:46:24 -0600 Subject: [PATCH 1/2] fixes #273 --- apstools/devices.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apstools/devices.py b/apstools/devices.py index 71c4ecd64..a06200132 100644 --- a/apstools/devices.py +++ b/apstools/devices.py @@ -285,8 +285,11 @@ def inUserOperations(self): pass """ - verdict = self.machine_status.value in (1, "USER OPERATIONS") - # verdict = verdict and self.operating_mode.value not in (5, "MAINTENANCE") + valid_modes = ( + 1, "USER OPERATIONS", + 2, "Bm Ln Studies" + ) + verdict = self.machine_status.value in valid_modes return verdict From 2cf6220e6340cf1ac5f6264ea23dab7c1c663997 Mon Sep 17 00:00:00 2001 From: Pete Jemian Date: Fri, 31 Jan 2020 13:47:30 -0600 Subject: [PATCH 2/2] MNT #273 --- apstools/devices.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apstools/devices.py b/apstools/devices.py index a06200132..0a4d601ae 100644 --- a/apstools/devices.py +++ b/apstools/devices.py @@ -285,12 +285,10 @@ def inUserOperations(self): pass """ - valid_modes = ( + return self.machine_status.get() in ( 1, "USER OPERATIONS", 2, "Bm Ln Studies" ) - verdict = self.machine_status.value in valid_modes - return verdict class ShutterBase(Device):