From f1ea79f1cdfd5c75ce708ebb8d2834c1b68bdb9e Mon Sep 17 00:00:00 2001
From: caila-marashaj <caila.marashaj@opentrons.com>
Date: Wed, 31 Jul 2024 12:21:21 -0400
Subject: [PATCH 1/2] add upward move before requesting data buffer

---
 .../hardware_control/tool_sensors.py          | 34 ++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/hardware/opentrons_hardware/hardware_control/tool_sensors.py b/hardware/opentrons_hardware/hardware_control/tool_sensors.py
index c1b2f1650f5..759491c03b1 100644
--- a/hardware/opentrons_hardware/hardware_control/tool_sensors.py
+++ b/hardware/opentrons_hardware/hardware_control/tool_sensors.py
@@ -54,7 +54,10 @@
     MoveGroupStep,
 )
 from opentrons_hardware.hardware_control.move_group_runner import MoveGroupRunner
-from opentrons_hardware.hardware_control.types import MotorPositionStatus
+from opentrons_hardware.hardware_control.types import (
+    MotorPositionStatus,
+    MoveCompleteAck,
+)
 
 LOG = getLogger(__name__)
 PipetteProbeTarget = Literal[NodeId.pipette_left, NodeId.pipette_right]
@@ -179,10 +182,15 @@ async def run_sync_buffer_to_csv(
     tool: InstrumentProbeTarget,
     sensor_type: SensorType,
     output_file_heading: list[str],
+    raise_z: Optional[MoveGroupRunner] = None,
 ) -> Dict[NodeId, MotorPositionStatus]:
     """Runs the sensor pass move group and creates a csv file with the results."""
     sensor_metadata = [0, 0, mount_speed, plunger_speed, threshold]
     positions = await move_group.run(can_messenger=messenger)
+    if raise_z is not None:
+        #  if probing is finished, move the head node back up before requesting the data buffer
+        if positions[head_node].move_ack == MoveCompleteAck.stopped_by_condition:
+            await raise_z.run(can_messenger=messenger)
     # wait a little to see the dropoff curve
     await asyncio.sleep(0.15)
     for sensor_id in log_files.keys():
@@ -472,14 +480,24 @@ async def liquid_probe(
             pressure_output_file_heading,
         )
     elif sync_buffer_output:
+        raise_z = create_step(
+            distance={head_node: float64(max_z_distance)},
+            velocity={head_node: float64(-1 * mount_speed)},
+            acceleration={},
+            duration=float64(max_z_distance / mount_speed),
+            present_nodes=[head_node],
+        )
+        raise_z_runner = MoveGroupRunner(move_groups=[[raise_z]])
+
         return await run_sync_buffer_to_csv(
-            messenger,
-            mount_speed,
-            plunger_speed,
-            threshold_pascals,
-            head_node,
-            sensor_runner,
-            log_files,
+            messenger=messenger,
+            mount_speed=mount_speed,
+            plunger_speed=plunger_speed,
+            threshold=threshold_pascals,
+            head_node=head_node,
+            move_group=sensor_runner,
+            raise_z=raise_z_runner,
+            log_files=log_files,
             tool=tool,
             sensor_type=SensorType.pressure,
             output_file_heading=pressure_output_file_heading,

From 40332935504a2080e48c91ef380e2daa624ec5f4 Mon Sep 17 00:00:00 2001
From: Ryan howard <ryan.howard@opentrons.com>
Date: Wed, 31 Jul 2024 15:40:13 -0400
Subject: [PATCH 2/2] slightly rearrage the timing of this

---
 .../opentrons_hardware/hardware_control/tool_sensors.py   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hardware/opentrons_hardware/hardware_control/tool_sensors.py b/hardware/opentrons_hardware/hardware_control/tool_sensors.py
index 759491c03b1..6b6443d8828 100644
--- a/hardware/opentrons_hardware/hardware_control/tool_sensors.py
+++ b/hardware/opentrons_hardware/hardware_control/tool_sensors.py
@@ -187,10 +187,6 @@ async def run_sync_buffer_to_csv(
     """Runs the sensor pass move group and creates a csv file with the results."""
     sensor_metadata = [0, 0, mount_speed, plunger_speed, threshold]
     positions = await move_group.run(can_messenger=messenger)
-    if raise_z is not None:
-        #  if probing is finished, move the head node back up before requesting the data buffer
-        if positions[head_node].move_ack == MoveCompleteAck.stopped_by_condition:
-            await raise_z.run(can_messenger=messenger)
     # wait a little to see the dropoff curve
     await asyncio.sleep(0.15)
     for sensor_id in log_files.keys():
@@ -205,6 +201,10 @@ async def run_sync_buffer_to_csv(
             ),
             expected_nodes=[tool],
         )
+    if raise_z is not None and False:
+        #  if probing is finished, move the head node back up before requesting the data buffer
+        if positions[head_node].move_ack == MoveCompleteAck.stopped_by_condition:
+            await raise_z.run(can_messenger=messenger)
     for sensor_id in log_files.keys():
         sensor_capturer = LogListener(
             mount=head_node,