From 29a484f16ff83b4aa67f798026b60f785fb86ba1 Mon Sep 17 00:00:00 2001 From: ALITTLELZ Date: Tue, 31 Mar 2026 17:08:20 +0800 Subject: [PATCH] Add "trash" to site content_type in Deck and experiment JSONs Co-Authored-By: Claude Opus 4.6 --- .../devices/liquid_handling/prcxi/prcxi.py | 2 +- .../test/experiments/prcxi_9300_slim.json | 20 +++++--- .../test/experiments/prcxi_9320_slim.json | 48 ++++++++++++------- 3 files changed, 46 insertions(+), 24 deletions(-) diff --git a/unilabos/devices/liquid_handling/prcxi/prcxi.py b/unilabos/devices/liquid_handling/prcxi/prcxi.py index 68d58a68..8c06d798 100644 --- a/unilabos/devices/liquid_handling/prcxi/prcxi.py +++ b/unilabos/devices/liquid_handling/prcxi/prcxi.py @@ -110,7 +110,7 @@ class PRCXI9300Deck(Deck): # 向后兼容别名 _DEFAULT_SITE_POSITIONS = _9320_SITE_POSITIONS _DEFAULT_SITE_SIZE = {"width": 128.0, "height": 86, "depth": 0} - _DEFAULT_CONTENT_TYPE = ["plate", "tip_rack", "plates", "tip_racks", "tube_rack", "adaptor", "plateadapter", "module"] + _DEFAULT_CONTENT_TYPE = ["plate", "tip_rack", "plates", "tip_racks", "tube_rack", "adaptor", "plateadapter", "module", "trash"] def __init__(self, name: str, size_x: float, size_y: float, size_z: float, sites: Optional[List[Dict[str, Any]]] = None, model: str = "9320", **kwargs): diff --git a/unilabos/test/experiments/prcxi_9300_slim.json b/unilabos/test/experiments/prcxi_9300_slim.json index 55d141a2..3e7bd448 100644 --- a/unilabos/test/experiments/prcxi_9300_slim.json +++ b/unilabos/test/experiments/prcxi_9300_slim.json @@ -19,7 +19,7 @@ "_resource_type": "unilabos.devices.liquid_handling.prcxi.prcxi:PRCXI9300Deck", "_resource_child_name": "PRCXI_Deck" }, - "host": "10.20.30.167", + "host": "10.20.31.167", "port": 9999, "debug": false, "setup": true, @@ -89,7 +89,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -114,7 +115,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -139,7 +141,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -164,7 +167,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -189,7 +193,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -214,7 +219,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] } ] diff --git a/unilabos/test/experiments/prcxi_9320_slim.json b/unilabos/test/experiments/prcxi_9320_slim.json index 1ad470d1..7f3492ca 100644 --- a/unilabos/test/experiments/prcxi_9320_slim.json +++ b/unilabos/test/experiments/prcxi_9320_slim.json @@ -91,7 +91,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -116,7 +117,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -141,7 +143,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -166,7 +169,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -191,7 +195,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -216,7 +221,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -241,7 +247,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -266,7 +273,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -291,7 +299,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -316,7 +325,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -341,7 +351,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -366,7 +377,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -391,7 +403,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -416,7 +429,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -441,7 +455,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] }, { @@ -466,7 +481,8 @@ "tube_rack", "adaptor", "plateadapter", - "module" + "module", + "trash" ] } ]