Skip to content

Commit

Permalink
remove request_tip_len_on_channel
Browse files Browse the repository at this point in the history
  • Loading branch information
rickwierenga committed Jan 17, 2025
1 parent a17f0bb commit 3f9020f
Showing 1 changed file with 6 additions and 25 deletions.
31 changes: 6 additions & 25 deletions pylabrobot/liquid_handling/backends/hamilton/STAR.py
Original file line number Diff line number Diff line change
Expand Up @@ -7318,26 +7318,6 @@ async def clld_probe_z_height_using_channel(

return result_in_mm

async def request_tip_len_on_channel(
self,
channel_idx: int, # 0-indexed indexing of channels!
) -> float:
"""
Measures the length of the tip attached to the specified pipetting channel. This information is
available from the tip rack where the tip on channel `channel_idx` was picked up.
Parameters:
channel_idx: Index of the pipetting channel (0-indexed).
Returns:
The tip length in millimeters.
Raises:
NoTipError: If no tip is present on the channel.
"""

return self.head[channel_idx].get_tip().total_tip_length

async def ztouch_probe_z_height_using_channel(
self,
channel_idx: int, # 0-based indexing of channels!
Expand All @@ -7358,6 +7338,8 @@ async def ztouch_probe_z_height_using_channel(
Args:
channel_idx: The index of the channel to use for probing. Backmost channel = 0.
tip_len: override the tip length (of tip on channel `channel_idx`). Default is the tip length
of the tip that was picked up.
lowest_immers_pos: The lowest immersion position in mm.
start_pos_lld_search: The start position for z-touch search in mm.
channel_speed: The speed of channel movement in mm/sec.
Expand All @@ -7383,12 +7365,11 @@ async def ztouch_probe_z_height_using_channel(
f"found version '{version}'"
)

fitting_depth = 8 # mm, for 10, 50, 300, 1000 ul Hamilton tips

if tip_len is None:
tip_len = await self.request_tip_len_on_channel(channel_idx=channel_idx)
if start_pos_search is None:
start_pos_search = 334.7 - tip_len + fitting_depth
tip_len = self.head[channel_idx].get_tip().total_tip_length

# fitting_depth = 8 mm for 10, 50, 300, 1000 ul Hamilton tips
fitting_depth = self.head[channel_idx].get_tip().fitting_depth

tip_len_used_in_increments = (tip_len - fitting_depth) / STAR.z_drive_mm_per_increment
channel_head_start_pos = (
Expand Down

0 comments on commit 3f9020f

Please sign in to comment.