From 059977db1f160c8a21dccf845967dc265d34aa6a Mon Sep 17 00:00:00 2001
From: Klaus Wakonig <klaus.wakonig@psi.ch>
Date: Thu, 16 Mar 2023 22:52:04 +0100
Subject: [PATCH 1/2] feat: added nested object

---
 ophyd_devices/__init__.py |  9 ++++++++-
 ophyd_devices/sim/sim.py  | 11 +++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ophyd_devices/__init__.py b/ophyd_devices/__init__.py
index 22494ff..98c8659 100644
--- a/ophyd_devices/__init__.py
+++ b/ophyd_devices/__init__.py
@@ -3,6 +3,13 @@ from .epics import *
 from .galil.galil_ophyd import GalilMotor
 from .npoint.npoint import NPointAxis
 from .rt_lamni import RtLamniMotor
-from .sim.sim import SynAxisMonitor, SynAxisOPAAS, SynFlyer, SynSignalRO, SynSLSDetector
+from .sim.sim import (
+    SynAxisMonitor,
+    SynAxisOPAAS,
+    SynDeviceOPAAS,
+    SynFlyer,
+    SynSignalRO,
+    SynSLSDetector,
+)
 from .sls_devices.sls_devices import SLSInfo, SLSOperatorMessages
 from .smaract.smaract_ophyd import SmaractMotor
diff --git a/ophyd_devices/sim/sim.py b/ophyd_devices/sim/sim.py
index e870373..440e99f 100644
--- a/ophyd_devices/sim/sim.py
+++ b/ophyd_devices/sim/sim.py
@@ -624,6 +624,7 @@ class SynAxisOPAAS(Device, PositionerBase):
         else:
             update_state(value)
             self._done_moving()
+            st.set_finished()
         return st
 
     def stop(self, *, success=False):
@@ -638,6 +639,16 @@ class SynAxisOPAAS(Device, PositionerBase):
         return "mm"
 
 
+class SynDeviceSubOPAAS(Device):
+    zsub = Cpt(SynAxisOPAAS, name="zsub")
+
+
+class SynDeviceOPAAS(Device):
+    x = Cpt(SynAxisOPAAS, name="x")
+    y = Cpt(SynAxisOPAAS, name="y")
+    z = Cpt(SynDeviceSubOPAAS, name="z")
+
+
 if __name__ == "__main__":
     det = SynSLSDetector(name="moench")
     det.trigger()

From 4de1fb91660c59e2ea239f10c94da00e1570b5eb Mon Sep 17 00:00:00 2001
From: Klaus Wakonig <klaus.wakonig@psi.ch>
Date: Thu, 16 Mar 2023 23:37:28 +0100
Subject: [PATCH 2/2] formatter: fixed formatter

---
 ophyd_devices/epics/devices/X07MADevices.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/ophyd_devices/epics/devices/X07MADevices.py b/ophyd_devices/epics/devices/X07MADevices.py
index 54b1a88..23cb790 100644
--- a/ophyd_devices/epics/devices/X07MADevices.py
+++ b/ophyd_devices/epics/devices/X07MADevices.py
@@ -61,6 +61,7 @@ class PGMOtFScan(FlyerInterface, Device):
     """
     PGM on-the-fly scan
     """
+
     SUB_VALUE = "value"
 
     e1 = Cpt(EpicsSignal, "E1", kind=Kind.config)
@@ -90,17 +91,13 @@ class PGMOtFScan(FlyerInterface, Device):
 
     def complete(self):
         def check_value(*, old_value, value, **kwargs):
-            return (old_value == 1 and value == 0)
+            return old_value == 1 and value == 0
 
         status = SubscriptionStatus(self.acquire, check_value, event_type=self.acquire.SUB_VALUE)
         return status
 
     def collect(self):
-        data = {
-            "time": self._start_time,
-            "data": {},
-            "timestamps": {}
-        }
+        data = {"time": self._start_time, "data": {}, "timestamps": {}}
         for attr in ("edata", "data", "idata", "fdata"):
             obj = getattr(self, attr)
             data["data"][obj.name] = obj.get()