DAQ: move_park isntead of dry. Need a park and dry fucnction
This commit is contained in:
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user