From 6960e05815cde0b337da1eb57bbf218b7b741210 Mon Sep 17 00:00:00 2001 From: appleb_m Date: Thu, 11 Dec 2025 13:31:34 +0100 Subject: [PATCH] DAQ: move_park isntead of dry. Need a park and dry fucnction --- daq/src/aaredaq/daq.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/daq/src/aaredaq/daq.py b/daq/src/aaredaq/daq.py index bec970d3..06f35748 100644 --- a/daq/src/aaredaq/daq.py +++ b/daq/src/aaredaq/daq.py @@ -325,13 +325,14 @@ class AareDAQ: def __mount_failure_handler(self, mount_error): failed = self.__cfg.increment_failed_mount_count() if failed >=4: - self.__devs.tell.dry(wait=False, wait_cold=False) + #TODO move park does not dry, need to change this!!! + self.__devs.tell.move_park(wait=False) raise CriticalTellException(f"Repeated drying failure, moved to park" - f"\nThere either really is no sample or" + f"\nThere either really is no sample or " f"a critical failure.\nPlease check the dewar and if a sample, " f"please contact the MX team") elif failed >=3: - self.__devs.tell.dry(wait=False, wait_cold=False) + self.__devs.tell.move_park(wait=False) raise WarningTellException(f"Continued to not find a sample, drying robot in park for 10 minutes. " f"\n Please get a cup of coffee.\nAfter the robot has dried, " f"check the sample positions that have been missed, if no samples continue!" @@ -1452,7 +1453,7 @@ class AareDAQ: self.__aare.sample_failed(sample) self.__cfg.state_busy = False end = time.perf_counter() - return end - start + raise e #raise end = time.perf_counter()