add a system to lld every time but disable for now'

ryanthecoder · ryanthecoder · commit 3d86ba1fa481 · 2025-08-08T15:19:55.000-04:00
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch1000.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch1000.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,
 retract_discontinuity,20,,,
 disc_ver_cuttoff,37,,,
 gantry_speed,40,,,
+lld_every_tip,FALSE,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch1000_extra.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch1000_extra.csv
@@ -28,3 +28,4 @@ is_extra,TRUE,,,
 retract_discontinuity,20,,,
 disc_ver_cuttoff,37,,,
 gantry_speed,40,,,
+lld_every_tip,FALSE,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch1000_increment_1000ul.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch1000_increment_1000ul.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,,,,,,,,,,,,,
 retract_discontinuity,20,,,,,,,,,,,,,,,
 disc_ver_cuttoff,37,,,,,,,,,,,,,,,
 gantry_speed,40,,,,,,,,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch1000_increment_200ul.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch1000_increment_200ul.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,,,,,,,,,,,,
 retract_discontinuity,20,,,,,,,,,,,,,,
 disc_ver_cuttoff,37,,,,,,,,,,,,,,
 gantry_speed,40,,,,,,,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch1000_increment_50ul.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch1000_increment_50ul.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,,,,,,,,,,,,,,,,,
 retract_discontinuity,20,,,,,,,,,,,,,,,,,,,
 disc_ver_cuttoff,37,,,,,,,,,,,,,,,,,,,
 gantry_speed,40,,,,,,,,,,,,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,,,,,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch50.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch50.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,
 retract_discontinuity,20,,,
 disc_ver_cuttoff,36,,,
 gantry_speed,40,,,
+lld_every_tip,FALSE,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch50_extra.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch50_extra.csv
@@ -28,3 +28,4 @@ is_extra,TRUE,,,
 retract_discontinuity,20,,,
 disc_ver_cuttoff,36,,,
 gantry_speed,40,,,
+lld_every_tip,FALSE,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch50_increment_50ul.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch50_increment_50ul.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,,,,,,,,,,,,,,,,,
 retract_discontinuity,20,,,,,,,,,,,,,,,,,,,
 disc_ver_cuttoff,36,,,,,,,,,,,,,,,,,,,
 gantry_speed,40,,,,,,,,,,,,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,,,,,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch50_increment_50ul_lv.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/1ch50_increment_50ul_lv.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,,,,,,,,,,,,,,,,
 retract_discontinuity,20,,,,,,,,,,,,,,,,,,
 disc_ver_cuttoff,36,,,,,,,,,,,,,,,,,,
 gantry_speed,40,,,,,,,,,,,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,,,,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch1000.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch1000.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,
 retract_discontinuity,20,,,
 disc_ver_cuttoff,35,,,
 gantry_speed,40,,,
+lld_every_tip,FALSE,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch1000_extra.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch1000_extra.csv
@@ -2,7 +2,7 @@ name,gravimetric-ot3-p1000-multi,,,
 increment,FALSE,,,
 mount,left,,,
 pipette,1000,8,,
-tips,50,1000,50,200,
+tips,50,1000,50,200
 trials,10,,,
 return_tip,FALSE,,,
 touch_tip,FALSE,,,
@@ -28,3 +28,4 @@ is_extra,TRUE,,,
 retract_discontinuity,20,,,
 disc_ver_cuttoff,35,,,
 gantry_speed,40,,,
+lld_every_tip,FALSE,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch1000_increment_1000ul.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch1000_increment_1000ul.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,,,,,,,,,,,,,,,,,,,,,,
 retract_discontinuity,20,,,,,,,,,,,,,,,,,,,,,,,,
 disc_ver_cuttoff,35,,,,,,,,,,,,,,,,,,,,,,,,
 gantry_speed,40,,,,,,,,,,,,,,,,,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,,,,,,,,,,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch1000_increment_200ul.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch1000_increment_200ul.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,,,,,,,,,,,,,,,,,,,,,,
 retract_discontinuity,20,,,,,,,,,,,,,,,,,,,,,,,,
 disc_ver_cuttoff,35,,,,,,,,,,,,,,,,,,,,,,,,
 gantry_speed,40,,,,,,,,,,,,,,,,,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,,,,,,,,,,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch1000_increment_50ul.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch1000_increment_50ul.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,,,,,,,,,,,,,,,,,,,,,,,
 retract_discontinuity,20,,,,,,,,,,,,,,,,,,,,,,,,,
 disc_ver_cuttoff,35,,,,,,,,,,,,,,,,,,,,,,,,,
 gantry_speed,40,,,,,,,,,,,,,,,,,,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,,,,,,,,,,,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch50.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch50.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,
 retract_discontinuity,20,,,
 disc_ver_cuttoff,35,,,
 gantry_speed,40,,,
+lld_every_tip,FALSE,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch50_extra.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch50_extra.csv
@@ -28,3 +28,4 @@ is_extra,TRUE,,,,,
 retract_discontinuity,20,,,,,
 disc_ver_cuttoff,35,,,,,
 gantry_speed,40,,,,,
+lld_every_tip,FALSE,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch50_increment_50ul.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch50_increment_50ul.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,,,,,,,,,,,,,,,,,,,,,,
 retract_discontinuity,20,,,,,,,,,,,,,,,,,,,,,,,,
 disc_ver_cuttoff,35,,,,,,,,,,,,,,,,,,,,,,,,
 gantry_speed,40,,,,,,,,,,,,,,,,,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,,,,,,,,,,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch50_increment_50ul_lv.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/8ch50_increment_50ul_lv.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,,,,,,,,,,,,,,,,,,,,,
 retract_discontinuity,20,,,,,,,,,,,,,,,,,,,,,,,
 disc_ver_cuttoff,35,,,,,,,,,,,,,,,,,,,,,,,
 gantry_speed,40,,,,,,,,,,,,,,,,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,,,,,,,,,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch1000.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch1000.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,,,,,,
 retract_discontinuity,20,,,,,,,,
 disc_ver_cuttoff,36,,,,,,,,
 gantry_speed,40,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch1000_extra.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch1000_extra.csv
@@ -28,3 +28,4 @@ is_extra,TRUE,,,,,,,,
 retract_discontinuity,20,,,,,,,,
 disc_ver_cuttoff,36,,,,,,,,
 gantry_speed,40,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch1000_increment_1000ul.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch1000_increment_1000ul.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,,,,,,,,,,,,,,,
 retract_discontinuity,20,,,,,,,,,,,,,,,,,
 disc_ver_cuttoff,36,,,,,,,,,,,,,,,,,
 gantry_speed,40,,,,,,,,,,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,,,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch1000_increment_200ul.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch1000_increment_200ul.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,,,,,,,,,
 retract_discontinuity,20,,,,,,,,,,,
 disc_ver_cuttoff,36,,,,,,,,,,,
 gantry_speed,40,,,,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch1000_increment_50ul.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch1000_increment_50ul.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,,,,,,,,,,
 retract_discontinuity,20,,,,,,,,,,,,
 disc_ver_cuttoff,36,,,,,,,,,,,,
 gantry_speed,40,,,,,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch200.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch200.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,,,,,,
 retract_discontinuity,20,,,,,,,,
 disc_ver_cuttoff,31,,,,,,,,
 gantry_speed,40,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch200_increment_200ul.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch200_increment_200ul.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,,,,,,,,,,
 retract_discontinuity,20,,,,,,,,,,,,
 disc_ver_cuttoff,31,,,,,,,,,,,,
 gantry_speed,40,,,,,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch200_increment_50ul.csv b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/96ch200_increment_50ul.csv
@@ -28,3 +28,4 @@ is_extra,FALSE,,,,,,,,,,,,,,,,
 retract_discontinuity,20,,,,,,,,,,,,,,,,
 disc_ver_cuttoff,31,,,,,,,,,,,,,,,,
 gantry_speed,40,,,,,,,,,,,,,,,,
+lld_every_tip,FALSE,,,,,,,,,,,,,,,,
diff --git a/hardware-testing/hardware_testing/gravimetric/protocol_replacement/gravimetric.py b/hardware-testing/hardware_testing/gravimetric/protocol_replacement/gravimetric.py
@@ -172,6 +172,7 @@ class FixtureSettings:
     fast_simulate: bool
     retract_discontinuity: float
     disc_ver_cuttoff: int
+    lld_every_tip: bool
 
     @classmethod
     def build(cls, ctx: ProtocolContext) -> "FixtureSettings":
@@ -250,6 +251,7 @@ def lookup_key(key: str, csv: List[List[str]]) -> List[str]:
         )
         disc_ver_cuttoff = int(lookup_key("disc_ver_cuttoff", csv_params)[0])
         gantry_speed = int(lookup_key("gantry_speed", csv_params)[0])
+        lld_every_tip = bool(lookup_key("lld_every_tip", csv_params)[0] == "TRUE")
         volumes = {
             20: volumes_to_test_20ul,
             50: volumes_to_test_50ul,
@@ -427,6 +429,7 @@ def lookup_key(key: str, csv: List[List[str]]) -> List[str]:
             fast_simulate=fast_simulate,
             retract_discontinuity=retract_discontinuity,
             disc_ver_cuttoff=disc_ver_cuttoff,
+            lld_every_tip=lld_every_tip,
         )
 
     def validate_settings(self) -> bool:
@@ -1060,15 +1063,18 @@ def run_one_test(
         fixture_settings, MeasurementType.INIT, tip, volume, trial, channel=channel
     )
     liq = SupportedLiquid.from_string(fixture_settings.liquid_name)
-    volume_lost_since_last_trial = calculate_change_in_volume(
-        last_measurement, pre_aspirate, liq
-    )
-    if not fixture_settings.ctx.is_simulating():
-        fixture_settings.liquid_source.load_liquid(
-            fixture_settings.liquid,
-            fixture_settings.liquid_source.current_liquid_volume()  # type: ignore[arg-type]
-            - volume_lost_since_last_trial,
+    if fixture_settings.lld_every_tip:
+        fixture_settings.pipette.require_liquid_presence(fixture_settings.liquid_source)
+    else:
+        volume_lost_since_last_trial = calculate_change_in_volume(
+            last_measurement, pre_aspirate, liq
         )
+        if not fixture_settings.ctx.is_simulating():
+            fixture_settings.liquid_source.load_liquid(
+                fixture_settings.liquid,
+                fixture_settings.liquid_source.current_liquid_volume()  # type: ignore[arg-type]
+                - volume_lost_since_last_trial,
+            )
     print_info("aspirating")
     contents = aspirate_with_liquid_class(
         fixture_settings, tip, volume, trial, channel, transfer_properties
