fix: unmount sample at end of automation
CI / lint (pull_request) Successful in 42s
CI / test (3.12) (pull_request) Successful in 1m4s
CI / test (3.13) (pull_request) Successful in 1m5s
CI / test (3.14) (pull_request) Successful in 1m5s
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Successful in 1m7s
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Successful in 1m16s
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Successful in 1m23s
CI / test-with-coverage (pull_request) Successful in 1m35s
CI / coverage-analysis (pull_request) Failing after 4s
CI / lint (push) Successful in 40s
Docs build and publish / docker (push) Successful in 6s
CI / test (3.12) (push) Canceled after 52s
CI / test (3.13) (push) Canceled after 51s
CI / test (3.14) (push) Canceled after 47s
CI / test-with-beamline-plugins (pxi_bec) (push) Canceled after 46s
CI / test-with-beamline-plugins (pxii_bec) (push) Canceled after 23s
CI / test-with-beamline-plugins (pxiii_bec) (push) Canceled after 18s
CI / test-with-coverage (push) Canceled after 17s
CI / coverage-analysis (push) Canceled after 0s
Build and Publish / release (push) Successful in 12s
CI / lint (pull_request) Successful in 42s
CI / test (3.12) (pull_request) Successful in 1m4s
CI / test (3.13) (pull_request) Successful in 1m5s
CI / test (3.14) (pull_request) Successful in 1m5s
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Successful in 1m7s
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Successful in 1m16s
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Successful in 1m23s
CI / test-with-coverage (pull_request) Successful in 1m35s
CI / coverage-analysis (pull_request) Failing after 4s
CI / lint (push) Successful in 40s
Docs build and publish / docker (push) Successful in 6s
CI / test (3.12) (push) Canceled after 52s
CI / test (3.13) (push) Canceled after 51s
CI / test (3.14) (push) Canceled after 47s
CI / test-with-beamline-plugins (pxi_bec) (push) Canceled after 46s
CI / test-with-beamline-plugins (pxii_bec) (push) Canceled after 23s
CI / test-with-beamline-plugins (pxiii_bec) (push) Canceled after 18s
CI / test-with-coverage (push) Canceled after 17s
CI / coverage-analysis (push) Canceled after 0s
Build and Publish / release (push) Successful in 12s
This commit was merged in pull request #207.
This commit is contained in:
@@ -53,7 +53,6 @@ class SampleQueuePanel(QFrame):
|
||||
self._experiment_shutter_state = None
|
||||
self._door_prohibited = None
|
||||
self._tell_connected = True
|
||||
self.loop_restart_requested = None
|
||||
|
||||
self._recovery_timer = QTimer(self)
|
||||
self._recovery_timer.setSingleShot(True)
|
||||
@@ -284,20 +283,12 @@ class SampleQueuePanel(QFrame):
|
||||
def _finish_empty_queue(self):
|
||||
self.pause_automation()
|
||||
|
||||
if hasattr(self, "loop_restart_requested"):
|
||||
logger.info("Loop restart requested")
|
||||
try:
|
||||
if self.loop_restart_requested():
|
||||
return
|
||||
except Exception:
|
||||
logger.exception("Loop restart request failed")
|
||||
logger.info("Automation queue empty; unmounting current sample.")
|
||||
self.unmount.emit()
|
||||
|
||||
if self.park_and_dry_when_cleared.isChecked():
|
||||
logger.info("Automation queue empty; parking and drying TELL.")
|
||||
self.park_and_dry.emit()
|
||||
else:
|
||||
logger.info("Automation queue empty; unmounting current sample.")
|
||||
self.unmount.emit()
|
||||
|
||||
def run(self):
|
||||
self._recovery_timer.stop()
|
||||
|
||||
Reference in New Issue
Block a user