2 spaces, not private, no redundant doc

Author: rickwierenga

Diff for: pylabrobot/resources/celltreat/plates.py

@@ -1,100 +1,100 @@
 from typing import Optional
-from pylabrobot.resources.height_functions import _compute_height_from_volume_cylinder, _compute_volume_from_height_cylinder
+from pylabrobot.resources.height_functions import (
+  compute_height_from_volume_cylinder, compute_volume_from_height_cylinder)
 
 from pylabrobot.resources.plate import Lid, Plate
 from pylabrobot.resources.utils import create_equally_spaced_2d
 from pylabrobot.resources.well import Well, WellBottomType
 
 
 def CellTreat_96_WP_U(name: str, lid: Optional[Lid] = None) -> Plate:
-    """
-    CellTreat cat. no.: 229590
-    - Material: Polystyrene
-    - Tissue culture treated: No
-    """
-    WELL_UBOTTOM_HEIGHT = 2.81 # absolute height of cylindrical segment, measured
-    WELL_DIAMETER = 6.69 # measured
+  """
+  CellTreat cat. no.: 229590
+  - Material: Polystyrene
+  - Tissue culture treated: No
+  """
+  WELL_UBOTTOM_HEIGHT = 2.81 # absolute height of cylindrical segment, measured
+  WELL_DIAMETER = 6.69 # measured
 
-    return Plate(
-        name=name,
-        size_x=127.76,
-        size_y=85.11,
-        size_z=14.30,  # without lid
-        lid=lid,
-        model=CellTreat_96_WP_U.__name__,
-        items=create_equally_spaced_2d(
-            Well,
-            num_items_x=12,
-            num_items_y=8,
-            dx=11.05,  # measured
-            dy=7.75,  # measured
-            dz=1.92,  # calibrated manually
-            item_dx=8.99,
-            item_dy=8.99,
-            size_x=6.35,
-            size_y=6.35,
-            size_z=10.04,
-            bottom_type=WellBottomType.U,
-        ),
-    )
+  return Plate(
+    name=name,
+    size_x=127.76,
+    size_y=85.11,
+    size_z=14.30,  # without lid
+    lid=lid,
+    model=CellTreat_96_WP_U.__name__,
+    items=create_equally_spaced_2d(
+      Well,
+      num_items_x=12,
+      num_items_y=8,
+      dx=11.05,  # measured
+      dy=7.75,  # measured
+      dz=1.92,  # calibrated manually
+      item_dx=8.99,
+      item_dy=8.99,
+      size_x=6.35,
+      size_y=6.35,
+      size_z=10.04,
+      bottom_type=WellBottomType.U,
+    ),
+  )
 
 
 def CellTreat_96_WP_U_Lid(name: str) -> Lid:
-    """
-    CellTreat cat. no.: 229590
-    - Material: Polystyrene
-    - Tissue culture treated: No
-    """
-    return Lid(
-        name=name,
-        size_x=127.762,
-        size_y=85.471,
-        size_z=10.71,  # measured
-        nesting_z_height=8.30,  # measured as height of plate "plateau"
-        model=CellTreat_96_WP_U_Lid.__name__,
-    )
+  """
+  CellTreat cat. no.: 229590
+  - Material: Polystyrene
+  - Tissue culture treated: No
+  """
+  return Lid(
+    name=name,
+    size_x=127.762,
+    size_y=85.471,
+    size_z=10.71,  # measured
+    nesting_z_height=8.30,  # measured as height of plate "plateau"
+    model=CellTreat_96_WP_U_Lid.__name__,
+  )
 
 
 def CellTreat_6_WP_Flat(name: str, lid: Optional[Lid] = None) -> Plate:
-    WELL_RADIUS = 17.5
+  WELL_RADIUS = 17.5
 
-    return Plate(
-        name=name,
-        size_x=127.0,
-        size_y=86.0,
-        size_z=20.5,
-        lid=lid,
-        model=CellTreat_6_WP_Flat.__name__,
-        items=create_equally_spaced_2d(
-            Well,
-            num_items_x=3,
-            num_items_y=2,
-            dx=6,
-            dy=5,
-            dz=3,
-            item_dx=38.5,
-            item_dy=38.5,
-            size_x=38.5,
-            size_y=38.5,
-            size_z=18.5,
-            bottom_type=WellBottomType.FLAT,
-            compute_volume_from_height=lambda liquid_height: _compute_volume_from_height_cylinder(
-                liquid_height, WELL_RADIUS
-            ),
-            compute_height_from_volume=lambda liquid_volume: _compute_height_from_volume_cylinder(
-                liquid_volume, WELL_RADIUS
-            ),
-        ),
-    )
+  return Plate(
+    name=name,
+    size_x=127.0,
+    size_y=86.0,
+    size_z=20.5,
+    lid=lid,
+    model=CellTreat_6_WP_Flat.__name__,
+    items=create_equally_spaced_2d(
+      Well,
+      num_items_x=3,
+      num_items_y=2,
+      dx=6,
+      dy=5,
+      dz=3,
+      item_dx=38.5,
+      item_dy=38.5,
+      size_x=38.5,
+      size_y=38.5,
+      size_z=18.5,
+      bottom_type=WellBottomType.FLAT,
+      compute_volume_from_height=lambda liquid_height: compute_volume_from_height_cylinder(
+        liquid_height, WELL_RADIUS
+      ),
+      compute_height_from_volume=lambda liquid_volume: compute_height_from_volume_cylinder(
+        liquid_volume, WELL_RADIUS
+      ),
+    ),
+  )
 
 
 def CellTreat_6_WP_Flat_Lid(name: str) -> Lid:
-    return Lid(
-        name=name,
-        size_x=127.0,
-        size_y=86.0,
-        size_z=9,
-        nesting_z_height=7.9,
-        model="CellTreat_6_WP_Rd_Lid",
-    )
-
+  return Lid(
+    name=name,
+    size_x=127.0,
+    size_y=86.0,
+    size_z=9,
+    nesting_z_height=7.9,
+    model="CellTreat_6_WP_Rd_Lid",
+  )

Diff for: pylabrobot/resources/height_functions.py

@@ -274,47 +274,45 @@ def calculate_liquid_height_container_1segment_round_fbottom(
 #         items=create_equally_spaced_2d(
 #             Well,
 #             ...
-#             compute_height_from_volume=lambda liquid_volume: _compute_height_from_volume_rectangle(
+#             compute_height_from_volume=lambda liquid_volume: compute_height_from_volume_rectangle(
 #                 liquid_volume, WELL_LENGTH, WELL_WIDTH
 #             ),
 #         ),
 #     )
 
-def _compute_volume_from_height_cylinder(liquid_height: float, well_radius: float) -> float:
-    """Compute volume (uL) from height (mm) for a cylinder."""
-    return math.pi * (well_radius**2) * liquid_height
+def compute_volume_from_height_cylinder(liquid_height: float, well_radius: float) -> float:
+  return math.pi * (well_radius**2) * liquid_height
 
 
-def _compute_height_from_volume_cylinder(liquid_volume: float, well_radius: float) -> float:
-    """Compute height (mm) from volume (uL) for a cylinder."""
-    return liquid_volume / (math.pi * (well_radius**2))
+def compute_height_from_volume_cylinder(liquid_volume: float, well_radius: float) -> float:
+  return liquid_volume / (math.pi * (well_radius**2))
 
 
-def _compute_volume_from_height_conicalfrustum(liquid_height: float, bottom_radius: float, top_radius: float) -> float:
-    """Compute volume (uL) from height (mm) for a conical frustum."""
-    return (1 / 3) * math.pi * liquid_height * (bottom_radius**2 + bottom_radius * top_radius + top_radius**2)
+def compute_volume_from_height_conical_frustum(liquid_height: float, bottom_radius: float,
+                                               top_radius: float) -> float:
+  return (1 / 3) * math.pi * liquid_height * (bottom_radius**2 + bottom_radius * top_radius +
+                                              top_radius**2)
 
 
-def _compute_height_from_volume_conicalfrustum(liquid_volume: float, bottom_radius: float, top_radius: float) -> float:
-    """Compute height (mm) from volume (uL) for a conical frustum."""
-    return (3 * liquid_volume) / (math.pi * (bottom_radius**2 + bottom_radius * top_radius + top_radius**2))
+def compute_height_from_volume_conical_frustum(liquid_volume: float, bottom_radius: float,
+                                               top_radius: float) -> float:
+  return (3 * liquid_volume) / (math.pi * (bottom_radius**2 + bottom_radius * top_radius +
+                                           top_radius**2))
 
 
-def _compute_volume_from_height_square(liquid_height: float, well_side_length: float) -> float:
-    """Compute volume (uL) from height (mm) for a square well."""
-    return liquid_height * (well_side_length**2)
+def compute_volume_from_height_square(liquid_height: float, well_side_length: float) -> float:
+  return liquid_height * (well_side_length**2)
 
 
-def _compute_height_from_volume_square(liquid_volume: float, well_side_length: float) -> float:
-    """Compute height (mm) from volume (uL) for a square well."""
-    return liquid_volume / (well_side_length**2)
+def compute_height_from_volume_square(liquid_volume: float, well_side_length: float) -> float:
+  return liquid_volume / (well_side_length**2)
 
 
-def _compute_volume_from_height_rectangle(liquid_height: float, well_length: float, well_width: float) -> float:
-    """Compute volume (uL) from height (mm) for a rectangular well."""
-    return liquid_height * (well_length * well_width)
+def compute_volume_from_height_rectangle(liquid_height: float, well_length: float,
+                                         well_width: float) -> float:
+  return liquid_height * (well_length * well_width)
 
 
-def _compute_height_from_volume_rectangle(liquid_volume: float, well_length: float, well_width: float) -> float:
-    """Compute height (mm) from volume (uL) for a rectangular well."""
-    return liquid_volume / (well_length * well_width)
+def compute_height_from_volume_rectangle(liquid_volume: float, well_length: float,
+                                         well_width: float) -> float:
+  return liquid_volume / (well_length * well_width)