bugfix: Bugfix for pulseblaster fixed shot duration workaround.

Sometimes check_status would run in between transition_to_static and start_run,
at which point the instance variables are in an inconsistant state and
an AttributeError is raised. The fix sets all instance variables to None
when they are not in use and check_status now checks only the last attribute
to be set, otherwise concluding that a fixed duration shot is not in progress.

Author: chrisjbillington

PulseBlaster.py

@@ -819,8 +819,10 @@ def init(self):
         pb_core_clock(75)
 
         # This is only set to True on a per-shot basis, so set it to False
-        # for manual mode
+        # for manual mode. Set associated attributes to None:
         self.time_based_stop_workaround = False
+        self.time_based_shot_duration = None
+        self.time_based_shot_end_time = None
 
     def program_manual(self,values):
 
@@ -1022,7 +1024,7 @@ def check_status(self):
                 self.waits_pending = False
             except zprocess.TimeoutError:
                 pass
-        if self.time_based_stop_workaround:
+        if self.time_based_shot_end_time is not None:
             import time
             time_based_shot_over = time.time() > self.time_based_shot_end_time
         else:
@@ -1041,8 +1043,10 @@ def transition_to_manual(self):
             done_condition = time_based_shot_over
 
         # This is only set to True on a per-shot basis, so reset it to False
-        # for manual mode
+        # for manual mode. Reset associated attributes to None:
         self.time_based_stop_workaround = False
+        self.time_based_shot_duration = None
+        self.time_based_shot_end_time = None
 
         if done_condition and not waits_pending:
             return True

PulseBlaster_No_DDS.py

@@ -262,8 +262,10 @@ def init(self):
         pb_core_clock(self.core_clock_freq)
 
         # This is only set to True on a per-shot basis, so set it to False
-        # for manual mode
+        # for manual mode. Set associated attributes to None:
         self.time_based_stop_workaround = False
+        self.time_based_shot_duration = None
+        self.time_based_shot_end_time = None
 
     def program_manual(self,values):
         # Program the DDS registers:
@@ -416,7 +418,7 @@ def check_status(self):
                 self.waits_pending = False
             except zprocess.TimeoutError:
                 pass
-        if self.time_based_stop_workaround:
+        if self.time_based_shot_end_time is not None:
             import time
             time_based_shot_over = time.time() > self.time_based_shot_end_time
         else:
@@ -435,8 +437,10 @@ def transition_to_manual(self):
             done_condition = time_based_shot_over
 
         # This is only set to True on a per-shot basis, so reset it to False
-        # for manual mode
+        # for manual mode. Reset associated attributes to None:
         self.time_based_stop_workaround = False
+        self.time_based_shot_duration = None
+        self.time_based_shot_end_time = None
 
         if done_condition and not waits_pending:
             return True