Calculate longest motor move time and set timeout (#1164)

* feat: calculate longest motor move time and set timeout

* tests: amend move_to_start test to check timeout

* chore: split out serial signal reads

Author: shihab-dls

src/ophyd_async/epics/pmac/_pmac_trajectory.py

@@ -10,6 +10,7 @@
     AsyncStatus,
     FlyerController,
     error_if_none,
+    gather_dict,
     observe_value,
     set_and_wait_for_value,
     wait_for_value,
@@ -202,12 +203,25 @@ async def _move_to_start(
         coord = self.pmac.coord[motor_info.cs_number]
         coros = []
         await coord.defer_moves.set(True)
+
+        motor_readbacks = await gather_dict(
+            {motor: motor.user_readback.get_value() for motor in ramp_up_position}
+        )
+
+        move_times = [
+            abs(position - motor_readbacks[motor])
+            / motor_info.motor_max_velocity[motor]
+            for motor, position in ramp_up_position.items()
+        ]
+
+        longest_time = max(move_times)
+
         for motor, position in ramp_up_position.items():
             coros.append(
                 set_and_wait_for_value(
                     coord.cs_axis_setpoint[motor_info.motor_cs_index[motor]],
                     position,
-                    set_timeout=10,
+                    set_timeout=longest_time + DEFAULT_TIMEOUT,
                     wait_for_set_completion=False,
                 )
             )

tests/unit_tests/epics/pmac/test_pmac_trajectory.py

@@ -5,7 +5,9 @@
 from scanspec.specs import Fly, Line
 
 from ophyd_async.core import (
+    DEFAULT_TIMEOUT,
     get_mock,
+    set_and_wait_for_value,
     set_mock_value,
 )
 from ophyd_async.epics.motor import Motor
@@ -54,22 +56,39 @@ async def test_pmac_move_to_start(sim_motors: tuple[PmacIO, Motor, Motor]):
     ramp_up_position = {sim_x_motor: np.float64(-1.2), sim_y_motor: np.float64(-0.6)}
     pmac_trajectory = PmacTrajectoryTriggerLogic(pmac_io)
 
-    await pmac_trajectory._move_to_start(motor_info, ramp_up_position)
-
-    coord_mock_calls = get_mock(coord).mock_calls
-
-    assert coord_mock_calls[0] == call.defer_moves.put(True, wait=True)
-    assert coord_mock_calls[1] == (
-        "cs_axis_setpoint.7.put",
-        (np.float64(-1.2)),
-        {"wait": True},
-    )
-    assert coord_mock_calls[2] == (
-        "cs_axis_setpoint.8.put",
-        (np.float64(-0.6)),
-        {"wait": True},
-    )
-    assert coord_mock_calls[3] == call.defer_moves.put(False, wait=True)
+    # Wrap set_and_wait_for_value to check passed arguments
+    with patch(
+        "ophyd_async.epics.pmac._pmac_trajectory.set_and_wait_for_value",
+        wraps=set_and_wait_for_value,
+    ) as spy_set_and_wait_for_value:
+        await pmac_trajectory._move_to_start(motor_info, ramp_up_position)
+
+        coord_mock_calls = get_mock(coord).mock_calls
+
+        assert coord_mock_calls[0] == call.defer_moves.put(True, wait=True)
+        assert coord_mock_calls[1] == (
+            "cs_axis_setpoint.7.put",
+            (np.float64(-1.2)),
+            {"wait": True},
+        )
+        assert coord_mock_calls[2] == (
+            "cs_axis_setpoint.8.put",
+            (np.float64(-0.6)),
+            {"wait": True},
+        )
+        assert coord_mock_calls[3] == call.defer_moves.put(False, wait=True)
+
+        # Longest move time should be sim_motor_x, so calculate this
+        expected_timeout = DEFAULT_TIMEOUT + (
+            abs(ramp_up_position[sim_x_motor])
+            / motor_info.motor_max_velocity[sim_x_motor]
+        )
+
+        # All motors should have the same move timeout
+        assert all(
+            call_.kwargs["set_timeout"] == expected_timeout
+            for call_ in spy_set_and_wait_for_value.mock_calls
+        )
 
 
 async def test_pmac_trajectory_kickoff(