Merge pull request #3 from hz-b/dev/feature/fix-pc-update-rdbk

magnets, power converters: update readback if set value changes

Author: Sulimankhail

src/dt4acc/custom_epics/ioc/pv_setup.py

@@ -45,13 +45,20 @@ def initialize_magnet_pvs(builder, magnet):
         initial_value=magnet["k"] or 0,
         on_update=lambda val: handle_device_update(magnet_name, "K", val),
     )
-    builder.aIn(f"{magnet_name}:Cm:rdbk", initial_value=val)
+    rdbk = builder.aIn(f"{magnet_name}:Cm:rdbk", initial_value=val)
+    async def handle_magnet_update(device_id: str, property_id: str, value: float):
+        r = await handle_device_update(device_id=device_id, property_id=property_id, value=value)
+        logger.info("%s:%s setting setpoint val=%s", device_id, property_id, value)
+        rdbk.set(value)
+        logger.info("%s:%s set readback  val=%s", device_id, property_id,value)
+        return r
+
     builder.aOut(
         f"{magnet_name}:im:I",
         initial_value=0.0,
         # Todo: what to do if current is set, should be rather read only
         # on_update=lambda val: handle_device_update(f"{magnet_name}:im:I", val)
-        on_update=lambda val: handle_device_update(
+        on_update=lambda val: handle_magnet_update(
             magnet_name, "powersupply_current", val
         ),
     )
@@ -103,13 +110,19 @@ def add_pc_pvs(builder, pc_name, prefix):
         DevicePropertyID(device_name=pc_name, property="set_current")
     )
     start_val = np.asarray(vals).mean()
+    rdbk = builder.aOut(f"{pc_name}:rdbk", initial_value=start_val)
+    async def handle_pc_update(device_id: str, property_id: str, value: float):
+        logger.debug("%s:%s updating setpoint val=%s", device_id, property_id, value)
+        r = await handle_device_update(device_id=device_id, property_id=property_id, value=value)
+        logger.debug("%s:%s updating rdbk val=%s", device_id, property_id, value)
+        rdbk.set(value)
+        return r
+
     builder.aOut(
         f"{pc_name}:set",
         initial_value=start_val,
-        on_update=lambda val: handle_device_update(pc_name, "set_current", val),
+        on_update=lambda val: handle_pc_update(pc_name, "set_current", val),
     )
-    #: todo ensur that readback is updated
-    builder.aOut(f"{pc_name}:rdbk", initial_value=start_val)
 
 
 def initialize_orbit_pvs(builder):