diff --git a/pylabrobot/resources/corning/plates.py b/pylabrobot/resources/corning/plates.py index 0553e606de2..70bd4747108 100644 --- a/pylabrobot/resources/corning/plates.py +++ b/pylabrobot/resources/corning/plates.py @@ -1,9 +1,7 @@ """Corning plates.""" from pylabrobot.resources.height_volume_functions import ( - calculate_liquid_height_container_1segment_round_fbottom, calculate_liquid_height_in_container_2segments_square_vbottom, - calculate_liquid_volume_container_1segment_round_fbottom, calculate_liquid_volume_container_2segments_square_vbottom, ) from pylabrobot.resources.plate import Lid, Plate @@ -16,6 +14,20 @@ # # # # # # # # # # Cor_96_wellplate_360ul_Fb # # # # # # # # # # +# Well tapers from 6.35 mm (bottom) to 6.86 mm (top) over 10.67 mm depth. +_cor_96_wellplate_360ul_Fb_height_volume_data = { + 0.0: 0.0, + 0.45: 20.0, # "dead volume" to cover the full flat bottom and ensure LLD detectability + 1.69: 50.0, + 3.22: 100.0, + 4.72: 150.0, + 6.19: 200.0, + 7.72: 250.0, + 8.99: 300.0, + 10.62: 350.0, + 10.95: 360.0, +} + def Cor_96_wellplate_360ul_Fb(name: str, with_lid: bool = False) -> Plate: """ @@ -60,8 +72,7 @@ def Cor_96_wellplate_360ul_Fb(name: str, with_lid: bool = False) -> Plate: bottom_type=WellBottomType.FLAT, cross_section_type=CrossSectionType.CIRCLE, max_volume=360, - compute_volume_from_height=_compute_volume_from_height_Cor_96_wellplate_360ul_Fb, - compute_height_from_volume=_compute_height_from_volume_Cor_96_wellplate_360ul_Fb, + height_volume_data=_cor_96_wellplate_360ul_Fb_height_volume_data, ), ) @@ -81,19 +92,6 @@ def Cor_96_wellplate_360ul_Fb_Lid(name: str) -> Lid: ) -# Volume-height functions -def _compute_volume_from_height_Cor_96_wellplate_360ul_Fb(h: float) -> float: - return calculate_liquid_volume_container_1segment_round_fbottom( - d=6.86, h_cylinder=10.67, liquid_height=h - ) - - -def _compute_height_from_volume_Cor_96_wellplate_360ul_Fb(liquid_volume: float) -> float: - return calculate_liquid_height_container_1segment_round_fbottom( - d=6.86, h_cylinder=10.67, liquid_volume=liquid_volume - ) - - # Previous names in PLR: def Cos_96_EZWash(name: str, with_lid: bool = False) -> Plate: raise ValueError("Deprecated. You probably want to use Cor_96_wellplate_360ul_Fb instead.")