WIP

src/ophyd_async/epics/sim/__main__.py

@@ -17,6 +17,7 @@
 
 # Start IOC with demo pvs in subprocess
 prefix = testing.generate_random_pv_prefix()
+prefix = "foo:"
 sim.start_ioc_subprocess(prefix, num_counters=3)
 
 # All Devices created within this block will be

src/ophyd_async/epics/sim/_counter.py

@@ -1,6 +1,6 @@
 from typing import Annotated as A
 
-from ophyd_async.core import SignalR, SignalRW, SignalX, StandardReadable, StrictEnum
+from ophyd_async.core import SignalR, SignalRW, StandardReadable, StrictEnum
 from ophyd_async.core import StandardReadableFormat as Format
 from ophyd_async.epics.core import EpicsDevice, PvSuffix
 
@@ -17,6 +17,5 @@ class EnergyMode(StrictEnum):
 class Counter(StandardReadable, EpicsDevice):
     """A demo sensor that produces a scalar value based on X and Y Movers"""
 
-    value: A[SignalR[int], PvSuffix("Value"), Format.HINTED_SIGNAL]
+    value: A[SignalR[int], PvSuffix("Value"), Format.HINTED_UNCACHED_SIGNAL]
     mode: A[SignalRW[EnergyMode], PvSuffix("Mode"), Format.CONFIG_SIGNAL]
-    reset: A[SignalX, PvSuffix("Reset")]

src/ophyd_async/epics/sim/_multichannelcounter.py

@@ -1,4 +1,3 @@
-import asyncio
 from typing import Annotated as A
 
 from ophyd_async.core import (
@@ -18,8 +17,9 @@
 
 class MultiChannelCounter(StandardReadable, EpicsDevice):
     acquire_time: A[SignalRW[float], PvSuffix("AcquireTime"), Format.CONFIG_SIGNAL]
-    start: A[SignalX, PvSuffix("Start")]
+    start: A[SignalX, PvSuffix("Start.PROC")]
     acquiring: A[SignalR[bool], PvSuffix("Acquiring")]
+    reset: A[SignalX, PvSuffix("Reset.PROC")]
 
     def __init__(self, prefix: str, name: str = "", num_counters: int = 3) -> None:
         with self.add_children_as_readables():
@@ -30,7 +30,6 @@ def __init__(self, prefix: str, name: str = "", num_counters: int = 3) -> None:
 
     @AsyncStatus.wrap
     async def trigger(self):
-        coros = [counter.reset.trigger() for counter in self.counters.values()]
-        await asyncio.gather(*coros)
+        await self.reset.trigger()
         timeout = await self.acquire_time.get_value() + DEFAULT_TIMEOUT
         await self.start.trigger(timeout=timeout)

src/ophyd_async/epics/sim/counter.db

@@ -14,16 +14,8 @@ record(calc, "$(P)$(CHANNEL):Value") {
     field(INPB,  "$(Y)Readback")
     field(INPC,  "$(CHANNEL)")
     field(INPD,  "$(P)$(CHANNEL):Mode.RVAL")
-    field(INPE,  "$(P)$(CHANNEL):Value")
-    field(CALC, "CEIL(SIN(A)**C+COS(D+B*A)+2)*999+E")
-    field(EGU,  "cts/s")
+    field(INPE,  "$(P)Elapsed CP")
+    field(CALC, "CEIL((SIN(A)**C+COS(D+B*A)+2)*10000*E)")
+    field(EGU,  "cts")
     field(PREC, "0")
-    field(SCAN, ".1 second")
-    field(SDIS, "$(P)Acquiring")
-    field(DISV, "0")
-}
-
-record(calcout, "$(P)$(CHANNEL):Reset") {
-    field(OUT, "$(P)$(CHANNEL):Value PP")
-    field(OCAL, "0")
 }

src/ophyd_async/epics/sim/multichannelcounter.db

@@ -1,16 +1,27 @@
 record(ao, "$(P)AcquireTime") {
     field(DESC, "Time to acquire for")
     field(VAL, "0.1")
-    field(OUT, "$(P)Start.DLY1")
+    field(OUT, "$(P)Start.DLY2")
     field(PINI, "YES")
 }
 
 record(seq, "$(P)Start") {
     field(DESC, "Start sequence")
-    field(LNK0, "$(P)Acquiring PP")
-    field(DO0, "1")
+    # Grab the start time
+    field(LNK0, "$(P)StartTime.PROC")
+    # Set it to be acquiring
     field(LNK1, "$(P)Acquiring PP")
-    field(DO0, "0")
+    field(DO1, "1")
+    # Set it back to idle
+    field(LNK2, "$(P)Acquiring PP")
+    field(DO2, "0")
+    # Set the elapsed time to the full acquire time
+    field(LNK3, "$(P)Elapsed PP")
+    field(DOL3, "$(P)AcquireTime")
+}
+
+record(ai, "$(P)StartTime") {
+    field(DTYP, "Soft Timestamp")
 }
 
 record(bi, "$(P)Acquiring") {
@@ -19,3 +30,30 @@ record(bi, "$(P)Acquiring") {
     field(ONAM, "Acquiring")
     field(PINI, "YES")
 }
+
+record(ai, "$(P)CurrentTime") {
+    field(DTYP, "Soft Timestamp")
+}
+
+record(calcout, "$(P)Process") {
+    field(DESC, "Process elapsed time if acquiring")
+    field(INPA, "$(P)StartTime")
+    field(INPB, "$(P)CurrentTime PP")
+    field(SCAN, ".1 second")
+    field(CALC, "B-A")
+    field(OUT, "$(P)Elapsed PP")
+    field(SDIS, "$(P)Acquiring")
+    field(DISV, "0")
+}
+
+record(ai, "$(P)Elapsed") {
+    field(DESC, "Elapsed time")
+    field(EGU,  "s")
+    field(PREC, "1")
+    field(PINI, "YES")
+}
+
+record(calcout, "$(P)Reset") {
+    field(OUT, "$(P)Elapsed PP")
+    field(CALC, "0")
+}

src/ophyd_async/epics/sim/plot.py

@@ -1,9 +1,6 @@
-import matplotlib.cbook as cbook
 import matplotlib.cm as cm
 import matplotlib.pyplot as plt
 import numpy as np
-from matplotlib.patches import PathPatch
-from matplotlib.path import Path
 
 delta = 0.025
 x = y = np.arange(-10.0, 10.0, delta)