end of day commit

ISISComputingGroup · Aug 8, 2024 · ab11169 · ab11169
1 parent bb22238
commit ab11169
Showing 1 changed file with 25 additions and 16 deletions.
diff --git a/src/ibex_bluesky_core/devices/dae.py b/src/ibex_bluesky_core/devices/dae.py
@@ -11,20 +11,20 @@
 
 
 class RunstateEnum(str, Enum):
-    PROCESSING = "PROCESSING",
-    SETUP = "SETUP",
-    RUNNING = "RUNNING",
-    PAUSED = "PAUSED",
-    WAITING = "WAITING",
-    VETOING = "VETOING",
-    ENDING = "ENDING",
-    SAVING = "SAVING",
-    RESUMING = "RESUMING",
-    PAUSING = "PAUSING",
-    BEGINNING = "BEGINNING",
-    ABORTING = "ABORTING",
-    UPDATING = "UPDATING",
-    STORING = "STORING",
+    PROCESSING = "PROCESSING"
+    SETUP = "SETUP"
+    RUNNING = "RUNNING"
+    PAUSED = "PAUSED"
+    WAITING = "WAITING"
+    VETOING = "VETOING"
+    ENDING = "ENDING"
+    SAVING = "SAVING"
+    RESUMING = "RESUMING"
+    PAUSING = "PAUSING"
+    BEGINNING = "BEGINNING"
+    ABORTING = "ABORTING"
+    UPDATING = "UPDATING"
+    STORING = "STORING"
     CHANING = "CHANGING"
 
 
@@ -39,11 +39,20 @@ def __init__(self, prefix: str, name: str = "DAE") -> None:
         dae_prefix = f"{prefix}DAE:"
         with self.add_children_as_readables():
             self.good_uah: SignalR[float] = epics_signal_r(float, f"{dae_prefix}GOODUAH")
-            self.run_number: SignalR[float] = epics_signal_r(float, f"{dae_prefix}RUNNUMBER")
-            self.run_state: SignalR[RunstateEnum] = epics_signal_r(RunstateEnum, f"{dae_prefix}RUNSTATE")
+
+            self.good_frames: SignalR[int] = epics_signal_r(int, f"{dae_prefix}GOODFRAMES")
+            self.period_good_frames: SignalR[int] = epics_signal_r(
+                int, f"{dae_prefix}GOODFRAMES:PD"
+            )
+            self.run_number: SignalR[int] = epics_signal_r(int, f"{dae_prefix}IRUNNUMBER")
+
+            self.run_state: SignalR[RunstateEnum] = epics_signal_r(
+                RunstateEnum, f"{dae_prefix}RUNSTATE"
+            )
 
             self.title: SignalRW = isis_epics_signal_rw(str, f"{dae_prefix}TITLE")
             self.users: SignalRW = isis_epics_signal_rw(str, f"{dae_prefix}_USERNAME")
+            self.rb_number: SignalRW = isis_epics_signal_rw(str, f"{dae_prefix}_RBNUMBER")
             # why does np.typing.NDArray not work?
             # self.spectra_1_period_1: SignalR[np.typing.NDArray] = epics_signal_r(np.typing.NDArray, f"{prefix}DAE"
             #                                                                                         f":SPECTRA:1:1")