@@ -7318,26 +7318,6 @@ async def clld_probe_z_height_using_channel(
7318
7318
7319
7319
return result_in_mm
7320
7320
7321
- async def request_tip_len_on_channel (
7322
- self ,
7323
- channel_idx : int , # 0-indexed indexing of channels!
7324
- ) -> float :
7325
- """
7326
- Measures the length of the tip attached to the specified pipetting channel. This information is
7327
- available from the tip rack where the tip on channel `channel_idx` was picked up.
7328
-
7329
- Parameters:
7330
- channel_idx: Index of the pipetting channel (0-indexed).
7331
-
7332
- Returns:
7333
- The tip length in millimeters.
7334
-
7335
- Raises:
7336
- NoTipError: If no tip is present on the channel.
7337
- """
7338
-
7339
- return self .head [channel_idx ].get_tip ().total_tip_length
7340
-
7341
7321
async def ztouch_probe_z_height_using_channel (
7342
7322
self ,
7343
7323
channel_idx : int , # 0-based indexing of channels!
@@ -7358,6 +7338,8 @@ async def ztouch_probe_z_height_using_channel(
7358
7338
7359
7339
Args:
7360
7340
channel_idx: The index of the channel to use for probing. Backmost channel = 0.
7341
+ tip_len: override the tip length (of tip on channel `channel_idx`). Default is the tip length
7342
+ of the tip that was picked up.
7361
7343
lowest_immers_pos: The lowest immersion position in mm.
7362
7344
start_pos_lld_search: The start position for z-touch search in mm.
7363
7345
channel_speed: The speed of channel movement in mm/sec.
@@ -7383,12 +7365,11 @@ async def ztouch_probe_z_height_using_channel(
7383
7365
f"found version '{ version } '"
7384
7366
)
7385
7367
7386
- fitting_depth = 8 # mm, for 10, 50, 300, 1000 ul Hamilton tips
7387
-
7388
7368
if tip_len is None :
7389
- tip_len = await self .request_tip_len_on_channel (channel_idx = channel_idx )
7390
- if start_pos_search is None :
7391
- start_pos_search = 334.7 - tip_len + fitting_depth
7369
+ tip_len = self .head [channel_idx ].get_tip ().total_tip_length
7370
+
7371
+ # fitting_depth = 8 mm for 10, 50, 300, 1000 ul Hamilton tips
7372
+ fitting_depth = self .head [channel_idx ].get_tip ().fitting_depth
7392
7373
7393
7374
tip_len_used_in_increments = (tip_len - fitting_depth ) / STAR .z_drive_mm_per_increment
7394
7375
channel_head_start_pos = (
0 commit comments