From d03069bea2824684ace372bd1055cfc88121d0df Mon Sep 17 00:00:00 2001 From: Sanniti Date: Mon, 6 Jan 2025 10:57:10 -0500 Subject: [PATCH] cleanup & fixes --- .../protocol_api/core/engine/instrument.py | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/api/src/opentrons/protocol_api/core/engine/instrument.py b/api/src/opentrons/protocol_api/core/engine/instrument.py index f287f018922..352456e54ba 100644 --- a/api/src/opentrons/protocol_api/core/engine/instrument.py +++ b/api/src/opentrons/protocol_api/core/engine/instrument.py @@ -1032,26 +1032,20 @@ def _pick_up_tip() -> None: air_gap=0, ) ] - src_dest_combo: Tuple[Tuple[Location, WellCore], Tuple[Location, WellCore]] for step_volume, src_dest_combo in source_dest_per_volume_step: - step_source: Tuple[Location, WellCore] - step_destination: Tuple[Location, WellCore] step_source, step_destination = src_dest_combo if new_tip == TransferTipPolicyV2.ALWAYS or ( new_tip == TransferTipPolicyV2.PER_SOURCE and step_source != prev_src ): - if ( - new_tip == TransferTipPolicyV2.PER_SOURCE - and step_source != prev_src - ): + if prev_src is not None: _drop_tip() - post_disp_tip_contents = [ - tx_comps_executor.LiquidAndAirGapPair( - liquid=0, - air_gap=0, - ) - ] _pick_up_tip() + post_disp_tip_contents = [ + tx_comps_executor.LiquidAndAirGapPair( + liquid=0, + air_gap=0, + ) + ] post_asp_tip_contents = self.aspirate_liquid_class( volume=step_volume, @@ -1069,16 +1063,10 @@ def _pick_up_tip() -> None: tip_contents=post_asp_tip_contents, trash_location=trash_location, ) - - if new_tip == TransferTipPolicyV2.ALWAYS: - _drop_tip() - post_disp_tip_contents = [ - tx_comps_executor.LiquidAndAirGapPair( - liquid=0, - air_gap=0, - ) - ] prev_src = step_source + if new_tip != TransferTipPolicyV2.NEVER: + # TODO: make sure that the tip has air gap when moving to the trash + _drop_tip() def _get_location_and_well_core_from_next_tip_info( self,