open_pub/Uni-Lab-OS
1
0
Fork 0
mirror of https://github.com/deepmodeling/Uni-Lab-OS synced 2026-04-01 15:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

适配前吸空气部分

Browse Source
This commit is contained in:
q434343
2026-04-01 11:50:42 +08:00
parent ad66fc1841
commit 8164d990cc
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
unilabos/devices/liquid_handling/liquid_handler_abstract.py
View File

@@ -1672,25 +1672,25 @@ class LiquidHandlerAbstract(LiquidHandlerMiddleware):
use_channels=use_channels,
)
# if blow_out_air_volume_before_vol > 0:
# source_tracker = getattr(sources[0], "tracker", None)
# source_tracker_was_disabled = bool(getattr(source_tracker, "is_disabled", False))
# try:
# if source_tracker is not None and hasattr(source_tracker, "disable"):
# source_tracker.disable()
# await self.aspirate(
# resources=[sources[0]],
# vols=[blow_out_air_volume_before_vol],
# use_channels=use_channels,
# flow_rates=None,
# offsets=[Coordinate(x=0, y=0, z=sources[0].get_size_z())],
# liquid_height=None,
# blow_out_air_volume=None,
# spread="custom",
# )
# finally:
# if source_tracker is not None:
# source_tracker.enable()
if blow_out_air_volume_before_vol > 0:
source_tracker = getattr(sources[0], "tracker", None)
source_tracker_was_disabled = bool(getattr(source_tracker, "is_disabled", False))
try:
if source_tracker is not None and hasattr(source_tracker, "disable"):
source_tracker.disable()
await self.aspirate(
resources=[sources[0]],
vols=[0],
use_channels=use_channels,
flow_rates=None,
offsets=[Coordinate(x=0, y=0, z=sources[0].get_size_z())],
liquid_height=None,
blow_out_air_volume=[blow_out_air_volume_before_vol],
spread="custom",
)
finally:
if source_tracker is not None:
source_tracker.enable()
await self.aspirate(
resources=[sources[0]],
@@ -1712,9 +1712,7 @@ class LiquidHandlerAbstract(LiquidHandlerMiddleware):
use_channels=use_channels,
flow_rates=[dis_flow_rates[0]] if dis_flow_rates and len(dis_flow_rates) > 0 else None,
offsets=[offsets[0]] if offsets and len(offsets) > 0 else None,
blow_out_air_volume=(
[blow_out_air_volume_vol] if blow_out_air_volume_vol > 0 else None
),
blow_out_air_volume=[blow_out_air_volume_vol+blow_out_air_volume_before_vol],
liquid_height=[liquid_height[0]] if liquid_height and len(liquid_height) > 0 else None,
spread=spread,
)

2
unilabos/devices/liquid_handling/prcxi/prcxi.py
View File

@@ -1816,6 +1816,8 @@ class PRCXI9300Backend(LiquidHandlerBackend):
async def aspirate(self, ops: List[SingleChannelAspiration], use_channels: List[int] = None):
"""Aspirate liquid from the specified resources."""
if ops[0].blow_out_air_volume and ops[0].volume == 0:
return
if hasattr(use_channels, "tolist"):
_use_channels = use_channels.tolist()
else: