Merge pull request #274 from BCDA-APS/273-aps-mode

APS user operations could be in mode 1 OR 2
BCDA-APS · Jan 31, 2020 · 888b308 · 888b308
2 parents 670b187 + 2cf6220
commit 888b308
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/apstools/devices.py b/apstools/devices.py
@@ -285,9 +285,10 @@ def inUserOperations(self):
                 pass
 
         """
-        verdict = self.machine_status.value in (1, "USER OPERATIONS")
-        # verdict = verdict and self.operating_mode.value not in (5, "MAINTENANCE")
-        return verdict
+        return self.machine_status.get() in (
+           1, "USER OPERATIONS",
+           2, "Bm Ln Studies"
+        )
 
 
 class ShutterBase(Device):