Skip to content

fix(api): fix aspirate/dispense while tracking move to#17854

Merged
caila-marashaj merged 6 commits intoedgefrom
fix-aspirate-while-tracking-move-to
Apr 15, 2025
Merged

fix(api): fix aspirate/dispense while tracking move to#17854
caila-marashaj merged 6 commits intoedgefrom
fix-aspirate-while-tracking-move-to

Conversation

@caila-marashaj
Copy link
Copy Markdown
Contributor

@caila-marashaj caila-marashaj commented Mar 21, 2025

Overview

In the protocol engine, before aspirating or dispensing while tracking, we call move_to_well to get to the Meniscus well location before we start z tracking. There's been a couple of errors in how that's called:

  • It was previously called with the operation_volume parameter. This is wrong because we need z tracking to start from where the meniscus currently is, not where it's going to be
  • It was being passed the current well the pipette was above as current_well. This would cause some pretty gnarly collisions if the aspirate/dispense while tracking commands were called starting from inside a tiprack, for example.

Additionally, the test_aspirate_while_tracking and test_dispense_while_tracking files just need a couple of their decoy calls updated to reflect the code changes.

@caila-marashaj caila-marashaj changed the base branch from edge to chore_release-8.4.0 April 15, 2025 14:55
@caila-marashaj caila-marashaj changed the base branch from chore_release-8.4.0 to edge April 15, 2025 15:12
@caila-marashaj caila-marashaj force-pushed the fix-aspirate-while-tracking-move-to branch from f1a321c to d260313 Compare April 15, 2025 15:28
@caila-marashaj caila-marashaj marked this pull request as ready for review April 15, 2025 15:29
@caila-marashaj caila-marashaj requested a review from a team as a code owner April 15, 2025 15:29
Copy link
Copy Markdown
Member

@sfoster1 sfoster1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, thank you!

@caila-marashaj caila-marashaj merged commit 5b94322 into edge Apr 15, 2025
24 checks passed
ddcc4 pushed a commit that referenced this pull request May 17, 2025
(cherry picked from commit 0ca313c3453a2f7e78cd88c38ccd00c35e5838cb)
ddcc4 pushed a commit that referenced this pull request May 17, 2025
(cherry picked from commit 0ca313c3453a2f7e78cd88c38ccd00c35e5838cb)
ddcc4 pushed a commit that referenced this pull request May 17, 2025
(cherry picked from commit 0ca313c3453a2f7e78cd88c38ccd00c35e5838cb)
ddcc4 pushed a commit that referenced this pull request May 17, 2025
ddcc4 pushed a commit that referenced this pull request May 17, 2025
ddcc4 pushed a commit that referenced this pull request May 17, 2025
ddcc4 pushed a commit that referenced this pull request May 19, 2025
ddcc4 pushed a commit that referenced this pull request May 19, 2025
ddcc4 pushed a commit that referenced this pull request May 19, 2025
ddcc4 pushed a commit that referenced this pull request May 20, 2025
ddcc4 pushed a commit that referenced this pull request May 20, 2025
ddcc4 pushed a commit that referenced this pull request May 22, 2025
ddcc4 pushed a commit that referenced this pull request May 23, 2025
ddcc4 pushed a commit that referenced this pull request May 24, 2025
ddcc4 pushed a commit that referenced this pull request May 24, 2025
ddcc4 pushed a commit that referenced this pull request May 29, 2025
ddcc4 pushed a commit that referenced this pull request May 29, 2025
ddcc4 pushed a commit that referenced this pull request May 29, 2025
ddcc4 pushed a commit that referenced this pull request May 29, 2025
ddcc4 added a commit that referenced this pull request May 30, 2025
ddcc4 added a commit that referenced this pull request May 30, 2025
…" in chore_release-8.5.0 (#18472)

This reverts commit d06a5f3.

# Overview

In PR #17854, @caila-marashaj deleted the `operation_volume` parameter
from the call to `move_to_well()` in `aspirate_while_tracking.py`,
asserting that "It was previously called with the `operation_volume`
parameter. This is wrong because we need z tracking to start from where
the meniscus currently is, not where it's going to be."

That PR was checked into `edge`. I picked that PR into `chore_release-8.5.0`.

But Caila's change somehow disappeared from `edge` entirely. The code in
`edge` now **does** have the
`move_to_well(operation_volume=-params.volume)` parameter. @ryanthecoder
thinks Caila's change was probably deleted from `edge` by one of the
mergebacks from `chore_release-8.4.0` into `edge`.

Ryan says that we **do** want
`move_to_well(operation_volume=-params.volume)`. So now I have to revert
Caila's change in `chore_release-8.5.0`.

## Test Plan and Hands on Testing

I'm taking Ryan's word for it that
`move_to_well(operation_volume=-params.volume)` is correct :)

But let's run the CI tests to see if everything passes.

## Risk assessment

Low I hope. Ryan says that the version **with**
`move_to_well(operation_volume=-params.volume)` is what we've tested and
released, so we should use that.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants