From 4394d25ea9e881829fe7bc72a4c5ebe073bd188d Mon Sep 17 00:00:00 2001 From: Enrui Lin Date: Mon, 7 Apr 2025 11:23:04 -0400 Subject: [PATCH 1/8] add MFX_WP_module_flat function for Hamilton PlateHolder --- pylabrobot/resources/hamilton/mfx_modules.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pylabrobot/resources/hamilton/mfx_modules.py b/pylabrobot/resources/hamilton/mfx_modules.py index 4521fec88e..2515f6a452 100644 --- a/pylabrobot/resources/hamilton/mfx_modules.py +++ b/pylabrobot/resources/hamilton/mfx_modules.py @@ -61,3 +61,16 @@ def MFX_DWP_module_flat(name: str) -> PlateHolder: model=MFX_DWP_rackbased_module.__name__, pedestal_size_z=0, ) + +def MFX_WP_module_flat(name: str) -> PlateHolder: + """Hamilton cat. no.: 188041 (uncertain) + """ + return PlateHolder( + name=name, + size_x=135.0, + size_y=94.0, + size_z=216 - 18.195 - 100, + # probe height - carrier_height - deck_height + child_location=Coordinate(3.0, 4.0, 209.9 - 18.195 - 100), + pedestal_size_z=0, + ) \ No newline at end of file From 07b2765644af0ead80cdc0bb8d0f9c4cf191fb29 Mon Sep 17 00:00:00 2001 From: Enrui Lin Date: Thu, 10 Apr 2025 22:45:19 -0400 Subject: [PATCH 2/8] update MFX_WP_module_flat docstring and add measurement detail --- pylabrobot/resources/hamilton/mfx_modules.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pylabrobot/resources/hamilton/mfx_modules.py b/pylabrobot/resources/hamilton/mfx_modules.py index 2515f6a452..879d280e23 100644 --- a/pylabrobot/resources/hamilton/mfx_modules.py +++ b/pylabrobot/resources/hamilton/mfx_modules.py @@ -64,12 +64,13 @@ def MFX_DWP_module_flat(name: str) -> PlateHolder: def MFX_WP_module_flat(name: str) -> PlateHolder: """Hamilton cat. no.: 188041 (uncertain) + Module to position a Well Plate. Taller version of MFX_DWP_module_flat. """ return PlateHolder( name=name, size_x=135.0, size_y=94.0, - size_z=216 - 18.195 - 100, + size_z=216 - 18.195 - 100, # mesured using probe # probe height - carrier_height - deck_height child_location=Coordinate(3.0, 4.0, 209.9 - 18.195 - 100), pedestal_size_z=0, From 4ed0e0215362fe025fc35464e7cb9f20dd9c1191 Mon Sep 17 00:00:00 2001 From: Enrui Lin Date: Thu, 10 Apr 2025 22:55:00 -0400 Subject: [PATCH 3/8] update Hamilton catalog number in MFX_WP_module_flat docstring --- pylabrobot/resources/hamilton/mfx_modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pylabrobot/resources/hamilton/mfx_modules.py b/pylabrobot/resources/hamilton/mfx_modules.py index 879d280e23..fc6c276c08 100644 --- a/pylabrobot/resources/hamilton/mfx_modules.py +++ b/pylabrobot/resources/hamilton/mfx_modules.py @@ -63,7 +63,7 @@ def MFX_DWP_module_flat(name: str) -> PlateHolder: ) def MFX_WP_module_flat(name: str) -> PlateHolder: - """Hamilton cat. no.: 188041 (uncertain) + """Hamilton cat. no.: 188049 (uncertain) Module to position a Well Plate. Taller version of MFX_DWP_module_flat. """ return PlateHolder( From 80190b640704a8d1271095687e0be39b7e430066 Mon Sep 17 00:00:00 2001 From: Enrui Lin Date: Thu, 10 Apr 2025 23:54:55 -0400 Subject: [PATCH 4/8] update MFX_WP_module_flat docstring to clarify resource size and child location measurements --- pylabrobot/resources/hamilton/mfx_modules.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pylabrobot/resources/hamilton/mfx_modules.py b/pylabrobot/resources/hamilton/mfx_modules.py index fc6c276c08..bbb3469554 100644 --- a/pylabrobot/resources/hamilton/mfx_modules.py +++ b/pylabrobot/resources/hamilton/mfx_modules.py @@ -62,10 +62,15 @@ def MFX_DWP_module_flat(name: str) -> PlateHolder: pedestal_size_z=0, ) + def MFX_WP_module_flat(name: str) -> PlateHolder: """Hamilton cat. no.: 188049 (uncertain) Module to position a Well Plate. Taller version of MFX_DWP_module_flat. """ + + # Resource size is carried over from MFX_DWP_module_flat. + # Child location offset for x, y are measured with caliper. + return PlateHolder( name=name, size_x=135.0, @@ -74,4 +79,4 @@ def MFX_WP_module_flat(name: str) -> PlateHolder: # probe height - carrier_height - deck_height child_location=Coordinate(3.0, 4.0, 209.9 - 18.195 - 100), pedestal_size_z=0, - ) \ No newline at end of file + ) From a2899ec14ecd08eb3ff08ff618aed9cbf6b832b8 Mon Sep 17 00:00:00 2001 From: Edison Lin Date: Fri, 11 Apr 2025 00:10:09 -0400 Subject: [PATCH 5/8] reformat --- pylabrobot/resources/hamilton/mfx_modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pylabrobot/resources/hamilton/mfx_modules.py b/pylabrobot/resources/hamilton/mfx_modules.py index bbb3469554..ef6b46f851 100644 --- a/pylabrobot/resources/hamilton/mfx_modules.py +++ b/pylabrobot/resources/hamilton/mfx_modules.py @@ -75,7 +75,7 @@ def MFX_WP_module_flat(name: str) -> PlateHolder: name=name, size_x=135.0, size_y=94.0, - size_z=216 - 18.195 - 100, # mesured using probe + size_z=216 - 18.195 - 100, # mesured using probe # probe height - carrier_height - deck_height child_location=Coordinate(3.0, 4.0, 209.9 - 18.195 - 100), pedestal_size_z=0, From fe64c215c0a4f4fda01b0f00a2052bcb1f5de5dd Mon Sep 17 00:00:00 2001 From: Enrui Lin Date: Wed, 16 Apr 2025 17:26:08 -0400 Subject: [PATCH 6/8] rename MFX_WP_module_flat to MFX_MTP_HPFlatSloped and update docstring --- pylabrobot/resources/hamilton/mfx_modules.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pylabrobot/resources/hamilton/mfx_modules.py b/pylabrobot/resources/hamilton/mfx_modules.py index ef6b46f851..7903b531a2 100644 --- a/pylabrobot/resources/hamilton/mfx_modules.py +++ b/pylabrobot/resources/hamilton/mfx_modules.py @@ -63,9 +63,9 @@ def MFX_DWP_module_flat(name: str) -> PlateHolder: ) -def MFX_WP_module_flat(name: str) -> PlateHolder: - """Hamilton cat. no.: 188049 (uncertain) - Module to position a Well Plate. Taller version of MFX_DWP_module_flat. +def MFX_MTP_HPFlatSloped(name: str) -> PlateHolder: + """Hamilton part. no.: 92585-01 (RNO) + Module to position a Well Plate. """ # Resource size is carried over from MFX_DWP_module_flat. From 8186f457034b726fb57e7a75f7f4b7d8bef12197 Mon Sep 17 00:00:00 2001 From: Enrui Lin Date: Wed, 16 Apr 2025 17:55:48 -0400 Subject: [PATCH 7/8] rename MFX_MTP_HPFlatSloped to Hamilton_MFXmodule_tall_flat and update docstring for clarity --- pylabrobot/resources/hamilton/mfx_modules.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pylabrobot/resources/hamilton/mfx_modules.py b/pylabrobot/resources/hamilton/mfx_modules.py index 7903b531a2..0b1bbf368f 100644 --- a/pylabrobot/resources/hamilton/mfx_modules.py +++ b/pylabrobot/resources/hamilton/mfx_modules.py @@ -63,17 +63,19 @@ def MFX_DWP_module_flat(name: str) -> PlateHolder: ) -def MFX_MTP_HPFlatSloped(name: str) -> PlateHolder: - """Hamilton part. no.: 92585-01 (RNO) +def Hamilton_MFXmodule_tall_flat(name: str) -> PlateHolder: + """Hamilton part. no.: 92585-01 (RNO) (Uncertain) Module to position a Well Plate. + + Also could be Hamilton cat.no.: 188228 """ - # Resource size is carried over from MFX_DWP_module_flat. + # Resource size is measured with caliper. # Child location offset for x, y are measured with caliper. return PlateHolder( name=name, - size_x=135.0, + size_x=134.0, size_y=94.0, size_z=216 - 18.195 - 100, # mesured using probe # probe height - carrier_height - deck_height From d42f6f1eca58e7e5c829a7864001f45439398e60 Mon Sep 17 00:00:00 2001 From: Edison Lin Date: Thu, 17 Apr 2025 10:46:32 -0400 Subject: [PATCH 8/8] update Hamilton_MFXmodule_tall_flat docstring and adjust size_x parameter --- pylabrobot/resources/hamilton/mfx_modules.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pylabrobot/resources/hamilton/mfx_modules.py b/pylabrobot/resources/hamilton/mfx_modules.py index 0b1bbf368f..34183aac64 100644 --- a/pylabrobot/resources/hamilton/mfx_modules.py +++ b/pylabrobot/resources/hamilton/mfx_modules.py @@ -64,10 +64,8 @@ def MFX_DWP_module_flat(name: str) -> PlateHolder: def Hamilton_MFXmodule_tall_flat(name: str) -> PlateHolder: - """Hamilton part. no.: 92585-01 (RNO) (Uncertain) + """Hamilton cat. no.: 188228 (BSZ) Module to position a Well Plate. - - Also could be Hamilton cat.no.: 188228 """ # Resource size is measured with caliper. @@ -75,7 +73,7 @@ def Hamilton_MFXmodule_tall_flat(name: str) -> PlateHolder: return PlateHolder( name=name, - size_x=134.0, + size_x=135.0, size_y=94.0, size_z=216 - 18.195 - 100, # mesured using probe # probe height - carrier_height - deck_height