From fcdbd9ac25d5e37392c7145c186cbf12feaa5841 Mon Sep 17 00:00:00 2001
From: Sander de Snoo <59472150+sldesnoo-Delft@users.noreply.github.com>
Date: Fri, 5 Aug 2022 09:47:11 +0200
Subject: [PATCH] Added retries to upload and play
---
pulse_lib/sequencer.py | 47 +++++++++++++++++++++++++++++++-----------
1 file changed, 35 insertions(+), 12 deletions(-)
diff --git a/pulse_lib/sequencer.py b/pulse_lib/sequencer.py
index c5bd0f0c..3b2d7518 100644
--- a/pulse_lib/sequencer.py
+++ b/pulse_lib/sequencer.py
@@ -404,17 +404,27 @@ class sequencer():
if index is None:
index = self.sweep_index[::-1]
self._validate_index(index)
- upload_job = self.uploader.create_job(self.sequence, index, self.id, self.n_rep, self._sample_rate,
- self.neutralize, alignment=self._alignment)
- upload_job.set_acquisition_conf(self._acquisition_conf)
-
- if self.hw_schedule is not None:
- upload_job.add_hw_schedule(self.hw_schedule, self._HVI_variables.item(tuple(index)).HVI_markers)
-
- self.uploader.add_upload_job(upload_job)
-
- return upload_job
-
+ n_failures = 0
+ while True:
+ try:
+ upload_job = self.uploader.create_job(self.sequence, index, self.id,
+ self.n_rep, self._sample_rate,
+ self.neutralize, alignment=self._alignment)
+ upload_job.set_acquisition_conf(self._acquisition_conf)
+
+ if self.hw_schedule is not None:
+ hvi_markers = self._HVI_variables.item(tuple(index)).HVI_markers
+ upload_job.add_hw_schedule(self.hw_schedule, hvi_markers)
+
+ self.uploader.add_upload_job(upload_job)
+ return upload_job
+ except Exception as e:
+ n_failures += 1
+ # '-8019' is a non-recoverable Keysight error
+ if '-8019' in repr(e) or n_failures == 3:
+ raise Exception(e)
+ logging.warning(f'Sequence upload failed at index {index}; retry #{n_failures}')
+ logging.info('Upload exception', exc_info=True)
def play(self, index=None, release= True):
'''
@@ -427,7 +437,20 @@ class sequencer():
if index is None:
index = self.sweep_index[::-1]
self._validate_index(index)
- self.uploader.play(self.id, index, release)
+
+ n_failures = 0
+ while True:
+ try:
+ self.uploader.play(self.id, index, release)
+ return
+ except Exception as e:
+ n_failures += 1
+ # '-8019' is a non-recoverable Keysight error
+ if '-8019' in repr(e) or n_failures == 3:
+ raise Exception(e)
+ logging.warning(f'Sequence play failed at index {index}; retry #{n_failures}')
+ logging.info('Play exception', exc_info=True)
+ self.upload(index)
def plot(self, index=None, segments=None, awg_output=True):
--
GitLab