From 32bcae437898a52026e51622d77ac8d42d47ba9f Mon Sep 17 00:00:00 2001 From: Ryan howard Date: Wed, 15 May 2024 12:30:39 -0400 Subject: [PATCH] remove minimum z distance --- api/src/opentrons/config/defaults_ot3.py | 2 -- api/src/opentrons/config/types.py | 1 - api/tests/opentrons/config/ot3_settings.py | 1 - .../hardware_control/backends/test_ot3_controller.py | 1 - api/tests/opentrons/hardware_control/test_ot3_api.py | 2 -- .../hardware_testing/gravimetric/config.py | 12 ------------ .../hardware_testing/liquid_sense/execute.py | 1 - .../pipette_assembly_qc_ot3/__main__.py | 1 - 8 files changed, 21 deletions(-) diff --git a/api/src/opentrons/config/defaults_ot3.py b/api/src/opentrons/config/defaults_ot3.py index 0b2499feaabd..9dccb1566d84 100644 --- a/api/src/opentrons/config/defaults_ot3.py +++ b/api/src/opentrons/config/defaults_ot3.py @@ -25,7 +25,6 @@ DEFAULT_LIQUID_PROBE_SETTINGS: Final[LiquidProbeSettings] = LiquidProbeSettings( starting_mount_height=100, max_z_distance=40, - min_z_distance=5, mount_speed=10, plunger_speed=5, sensor_threshold_pascals=40, @@ -337,7 +336,6 @@ def _build_default_liquid_probe( "starting_mount_height", default.starting_mount_height ), max_z_distance=from_conf.get("max_z_distance", default.max_z_distance), - min_z_distance=from_conf.get("min_z_distance", default.min_z_distance), mount_speed=from_conf.get("mount_speed", default.mount_speed), plunger_speed=from_conf.get("plunger_speed", default.plunger_speed), sensor_threshold_pascals=from_conf.get( diff --git a/api/src/opentrons/config/types.py b/api/src/opentrons/config/types.py index f13d5a5e6e37..476c3181dc2d 100644 --- a/api/src/opentrons/config/types.py +++ b/api/src/opentrons/config/types.py @@ -130,7 +130,6 @@ class OutputOptions(int, Enum): class LiquidProbeSettings: starting_mount_height: float max_z_distance: float - min_z_distance: float mount_speed: float plunger_speed: float sensor_threshold_pascals: float diff --git a/api/tests/opentrons/config/ot3_settings.py b/api/tests/opentrons/config/ot3_settings.py index 3cfa9b7c34c6..eb15cb8efe30 100644 --- a/api/tests/opentrons/config/ot3_settings.py +++ b/api/tests/opentrons/config/ot3_settings.py @@ -120,7 +120,6 @@ "liquid_sense": { "starting_mount_height": 80, "max_z_distance": 20, - "min_z_distance": 3, "mount_speed": 10, "plunger_speed": 10, "sensor_threshold_pascals": 17, diff --git a/api/tests/opentrons/hardware_control/backends/test_ot3_controller.py b/api/tests/opentrons/hardware_control/backends/test_ot3_controller.py index fd2d04699542..b57a4b2ab4bd 100644 --- a/api/tests/opentrons/hardware_control/backends/test_ot3_controller.py +++ b/api/tests/opentrons/hardware_control/backends/test_ot3_controller.py @@ -178,7 +178,6 @@ def fake_liquid_settings() -> LiquidProbeSettings: return LiquidProbeSettings( starting_mount_height=100, max_z_distance=15, - min_z_distance=5, mount_speed=40, plunger_speed=10, sensor_threshold_pascals=15, diff --git a/api/tests/opentrons/hardware_control/test_ot3_api.py b/api/tests/opentrons/hardware_control/test_ot3_api.py index 7ab0a2f1c004..718756d5a89d 100644 --- a/api/tests/opentrons/hardware_control/test_ot3_api.py +++ b/api/tests/opentrons/hardware_control/test_ot3_api.py @@ -115,7 +115,6 @@ def fake_liquid_settings() -> LiquidProbeSettings: return LiquidProbeSettings( starting_mount_height=100, max_z_distance=15, - min_z_distance=10, mount_speed=40, plunger_speed=10, sensor_threshold_pascals=15, @@ -800,7 +799,6 @@ async def test_liquid_probe( fake_settings_aspirate = LiquidProbeSettings( starting_mount_height=100, max_z_distance=15, - min_z_distance=5, mount_speed=40, plunger_speed=10, sensor_threshold_pascals=15, diff --git a/hardware-testing/hardware_testing/gravimetric/config.py b/hardware-testing/hardware_testing/gravimetric/config.py index f80d87d71243..394309b43f4d 100644 --- a/hardware-testing/hardware_testing/gravimetric/config.py +++ b/hardware-testing/hardware_testing/gravimetric/config.py @@ -90,7 +90,6 @@ class PhotometricConfig(VolumetricConfig): 1: { 50: { "max_z_distance": 20, - "min_z_distance": 5, "mount_speed": 11, "plunger_speed": 21, "sensor_threshold_pascals": 150, @@ -99,7 +98,6 @@ class PhotometricConfig(VolumetricConfig): 8: { 50: { "max_z_distance": 20, - "min_z_distance": 5, "mount_speed": 11, "plunger_speed": 21, "sensor_threshold_pascals": 150, @@ -110,21 +108,18 @@ class PhotometricConfig(VolumetricConfig): 1: { 50: { "max_z_distance": 20, - "min_z_distance": 5, "mount_speed": 5, "plunger_speed": 10, "sensor_threshold_pascals": 200, }, 200: { "max_z_distance": 20, - "min_z_distance": 5, "mount_speed": 5, "plunger_speed": 10, "sensor_threshold_pascals": 200, }, 1000: { "max_z_distance": 20, - "min_z_distance": 5, "mount_speed": 5, "plunger_speed": 11, "sensor_threshold_pascals": 150, @@ -133,21 +128,18 @@ class PhotometricConfig(VolumetricConfig): 8: { 50: { "max_z_distance": 20, - "min_z_distance": 5, "mount_speed": 5, "plunger_speed": 10, "sensor_threshold_pascals": 200, }, 200: { "max_z_distance": 20, - "min_z_distance": 5, "mount_speed": 5, "plunger_speed": 10, "sensor_threshold_pascals": 200, }, 1000: { "max_z_distance": 20, - "min_z_distance": 5, "mount_speed": 5, "plunger_speed": 11, "sensor_threshold_pascals": 150, @@ -156,21 +148,18 @@ class PhotometricConfig(VolumetricConfig): 96: { 50: { "max_z_distance": 20, - "min_z_distance": 5, "mount_speed": 5, "plunger_speed": 10, "sensor_threshold_pascals": 200, }, 200: { "max_z_distance": 20, - "min_z_distance": 5, "mount_speed": 5, "plunger_speed": 10, "sensor_threshold_pascals": 200, }, 1000: { "max_z_distance": 20, - "min_z_distance": 5, "mount_speed": 5, "plunger_speed": 11, "sensor_threshold_pascals": 150, @@ -189,7 +178,6 @@ def _get_liquid_probe_settings( return LiquidProbeSettings( starting_mount_height=well.top().point.z, max_z_distance=min(well.depth, lqid_cfg["max_z_distance"]), - min_z_distance=lqid_cfg["min_z_distance"], mount_speed=lqid_cfg["mount_speed"], plunger_speed=lqid_cfg["plunger_speed"], sensor_threshold_pascals=lqid_cfg["sensor_threshold_pascals"], diff --git a/hardware-testing/hardware_testing/liquid_sense/execute.py b/hardware-testing/hardware_testing/liquid_sense/execute.py index 9a61c172c8e1..05be865015f6 100644 --- a/hardware-testing/hardware_testing/liquid_sense/execute.py +++ b/hardware-testing/hardware_testing/liquid_sense/execute.py @@ -355,7 +355,6 @@ def _run_trial(run_args: RunArgs, tip: int, well: Well, trial: int) -> float: lps = LiquidProbeSettings( starting_mount_height=start_height, max_z_distance=z_dist, - min_z_distance=lqid_cfg["min_z_distance"], mount_speed=run_args.z_speed, plunger_speed=plunger_speed, sensor_threshold_pascals=lqid_cfg["sensor_threshold_pascals"], diff --git a/hardware-testing/hardware_testing/production_qc/pipette_assembly_qc_ot3/__main__.py b/hardware-testing/hardware_testing/production_qc/pipette_assembly_qc_ot3/__main__.py index 5e482afa6e7e..fabdb1012569 100644 --- a/hardware-testing/hardware_testing/production_qc/pipette_assembly_qc_ot3/__main__.py +++ b/hardware-testing/hardware_testing/production_qc/pipette_assembly_qc_ot3/__main__.py @@ -1377,7 +1377,6 @@ async def _test_liquid_probe( probe_settings = LiquidProbeSettings( starting_mount_height=start_pos.z, max_z_distance=max_z_distance_machine_coords, # FIXME: deck coords - min_z_distance=0, # FIXME: remove mount_speed=probe_cfg.mount_speed, plunger_speed=probe_cfg.plunger_speed, sensor_threshold_pascals=probe_cfg.sensor_threshold_pascals,