From 319f0c9479d027b8af5fb5c28ee30bc8bba95485 Mon Sep 17 00:00:00 2001 From: ben-ray Date: Sat, 8 Mar 2025 10:34:34 -0800 Subject: [PATCH 1/2] fix Thermo_Nunc_96_well_plate_1300uL_Rb --- pylabrobot/resources/thermo_fisher/plates.py | 22 +++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pylabrobot/resources/thermo_fisher/plates.py b/pylabrobot/resources/thermo_fisher/plates.py index 1fa96bfa293..3c793fae86b 100644 --- a/pylabrobot/resources/thermo_fisher/plates.py +++ b/pylabrobot/resources/thermo_fisher/plates.py @@ -1,5 +1,7 @@ """Thermo Fisher Scientific Inc. (and all its brand) plates""" +import math + from pylabrobot.resources.height_volume_functions import ( calculate_liquid_height_in_container_2segments_square_ubottom, calculate_liquid_volume_container_2segments_square_ubottom, @@ -245,15 +247,19 @@ def Thermo_AB_96_wellplate_300ul_Vb_EnduraPlate_P(name: str, with_lid: bool = Fa def Thermo_Nunc_96_well_plate_1300uL_Rb(name: str) -> Plate: - # https://assets.thermofisher.com/TFS-Assets/LSG/manuals/D03011.pdf - well_diameter = 8.40 # measured + """ + - Part no.: 260252 + - Diagram: https://assets.thermofisher.com/TFS-Assets/LSG/manuals/D03011.pdf + """ + + well_diameter = 8.00 # measured return Plate( name=name, size_x=127.76, # from definition, A size_y=85.47, # from definition, B - size_z=2.5 + 29.1, # from definition, E + L + size_z=31.6, # from definition, F lid=None, - model="Thermo_Nunc_96_well_plate_1300uL_Rb", + model=Thermo_Nunc_96_well_plate_1300uL_Rb.__name__, ordered_items=create_ordered_items_2d( Well, num_items_x=12, @@ -265,9 +271,9 @@ def Thermo_Nunc_96_well_plate_1300uL_Rb(name: str) -> Plate: item_dy=9, size_x=well_diameter, size_y=well_diameter, - size_z=29.1, # from definition, L + size_z=31.6 - 1.4, # from definition, F - N bottom_type=WellBottomType.U, - material_z_thickness=2.5 - 1.4, # from definition, E - N + material_z_thickness=31.6 - 29.1 - 1.4, # from definition, F - L - N cross_section_type=CrossSectionType.CIRCLE, - ), - ) + compute_height_from_volume = lambda liquid_volume: liquid_volume / (math.pi * ((well_diameter/2)**2))), + ) From f3f44c7e6dfac00cbe9b2b442776a61409cd603d Mon Sep 17 00:00:00 2001 From: Rick Wierenga Date: Sat, 8 Mar 2025 10:59:33 -0800 Subject: [PATCH 2/2] format --- pylabrobot/resources/thermo_fisher/plates.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pylabrobot/resources/thermo_fisher/plates.py b/pylabrobot/resources/thermo_fisher/plates.py index bf01d861a34..540f3ad674b 100644 --- a/pylabrobot/resources/thermo_fisher/plates.py +++ b/pylabrobot/resources/thermo_fisher/plates.py @@ -272,7 +272,9 @@ def Thermo_Nunc_96_well_plate_1300uL_Rb(name: str) -> Plate: size_y=well_diameter, size_z=31.6 - 1.4, # from definition, F - N bottom_type=WellBottomType.U, - material_z_thickness=31.6 - 29.1 - 1.4, # from definition, F - L - N + material_z_thickness=31.6 - 29.1 - 1.4, # from definition, F - L - N cross_section_type=CrossSectionType.CIRCLE, - compute_height_from_volume = lambda liquid_volume: liquid_volume / (math.pi * ((well_diameter/2)**2))), - ) + compute_height_from_volume=lambda liquid_volume: liquid_volume + / (math.pi * ((well_diameter / 2) ** 2)), + ), + )