From 2b9a4761a7c636d8174c60dee6ebd74c108ce00e Mon Sep 17 00:00:00 2001 From: Ryan howard Date: Wed, 8 May 2024 16:32:13 -0400 Subject: [PATCH] put a limit on the number of multi-passes --- hardware-testing/hardware_testing/liquid_sense/__main__.py | 3 +++ hardware-testing/hardware_testing/liquid_sense/execute.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hardware-testing/hardware_testing/liquid_sense/__main__.py b/hardware-testing/hardware_testing/liquid_sense/__main__.py index 18030c398f8..eb118c2edff 100644 --- a/hardware-testing/hardware_testing/liquid_sense/__main__.py +++ b/hardware-testing/hardware_testing/liquid_sense/__main__.py @@ -96,6 +96,7 @@ class RunArgs: dial_indicator: Optional[mitutoyo_digimatic_indicator.Mitutoyo_Digimatic_Indicator] plunger_speed: float trials_before_jog: int + multi_passes: int @classmethod def _get_protocol_context(cls, args: argparse.Namespace) -> ProtocolContext: @@ -236,6 +237,7 @@ def build_run_args(cls, args: argparse.Namespace) -> "RunArgs": dial_indicator=dial, plunger_speed=args.plunger_speed, trials_before_jog=args.trials_before_jog, + multi_passes=args.multi_passes, ) @@ -266,6 +268,7 @@ def build_run_args(cls, args: argparse.Namespace) -> "RunArgs": parser.add_argument("--ignore-env", action="store_true") parser.add_argument("--ignore-dial", action="store_true") parser.add_argument("--trials-before-jog", type=int, default=10) + parser.add_argument("--multi-passes", type=int, default=1) args = parser.parse_args() run_args = RunArgs.build_run_args(args) diff --git a/hardware-testing/hardware_testing/liquid_sense/execute.py b/hardware-testing/hardware_testing/liquid_sense/execute.py index 31fbb14d6c1..9a61c172c8e 100644 --- a/hardware-testing/hardware_testing/liquid_sense/execute.py +++ b/hardware-testing/hardware_testing/liquid_sense/execute.py @@ -349,7 +349,7 @@ def _run_trial(run_args: RunArgs, tip: int, well: Well, trial: int) -> float: ) z_distances: List[float] = find_max_z_distances(run_args, tip, well, plunger_speed) - + z_distances = z_distances[: run_args.multi_passes] start_height = well.top().point.z + run_args.start_height_offset for z_dist in z_distances: lps = LiquidProbeSettings(