fixed blowout location for source

Opentrons · Jan 9, 2025 · 85f736a · 85f736a
1 parent 50a8606
commit 85f736a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/api/src/opentrons/protocol_api/core/engine/instrument.py b/api/src/opentrons/protocol_api/core/engine/instrument.py
@@ -1114,7 +1114,6 @@ def aspirate_liquid_class(
         transfer_type: tx_comps_executor.TransferType,
         tip_contents: List[tx_comps_executor.LiquidAndAirGapPair],
     ) -> List[tx_comps_executor.LiquidAndAirGapPair]:
-        print("!!!!", tip_contents)
         """Execute aspiration steps.
 
         1. Submerge

diff --git a/api/src/opentrons/protocol_api/core/engine/transfer_components_executor.py b/api/src/opentrons/protocol_api/core/engine/transfer_components_executor.py
@@ -396,12 +396,17 @@ def retract_after_dispensing(
                     raise RuntimeError(
                         "Blowout location is 'source' but source location is not provided."
                     )
+                # TODO: check if we should add a blowout location z-offset in liq class definition
                 self._instrument.blow_out(
-                    location=source_location,
+                    location=Location(
+                        source_well.get_top(0), labware=source_location.labware
+                    ),
                     well_core=source_well,
                     in_place=False,
                 )
-                touch_tip_and_air_gap_location = source_location
+                touch_tip_and_air_gap_location = Location(
+                    source_well.get_top(0), labware=source_location.labware
+                )
                 touch_tip_and_air_gap_well = source_well
             else:
                 self._instrument.blow_out(
@@ -449,10 +454,7 @@ def _do_touch_tip_and_air_gap(
                     z_offset=touch_tip_props.z_offset,
                     speed=touch_tip_props.speed,
                 )
-            else:
-                raise RuntimeError(
-                    "Invalid touch tip location for post-dispense retraction."
-                )
+            # No touch tip if the there's no trash well, likely due to trash being trash bin or waste chute
             self._instrument.move_to(
                 location=location,
                 well_core=well,