automatically log trigger thresholds/bounds

Author: alustig3

source/communication/message.py

@@ -51,5 +51,6 @@ def get_subtype(self, subtype_char):
                     "t": "task",
                     "a": "api",
                     "u": "user",
+                    "s": "trigger",
                 },
             }[self][subtype_char]

source/pyControl/hardware.py

@@ -249,6 +249,8 @@ def _run_start(self):
         # Start sampling timer, initialise threshold, aquire first sample.
         self.timer.init(freq=self.channel.sampling_rate)
         self.timer.callback(self._timer_ISR)
+        for trigger in self.triggers:
+            trigger.run_start()
         self._timer_ISR(0)
 
     def _run_stop(self):
@@ -354,7 +356,7 @@ def __init__(self, threshold, rising_event=None, falling_event=None):
             raise ValueError("Either rising_event or falling_event or both must be specified.")
         self.rising_event = rising_event
         self.falling_event = falling_event
-        self.set_threshold(threshold)
+        self.threshold = threshold
         self.timestamp = 0
         self.crossing_direction = False
         assign_ID(self)
@@ -365,6 +367,9 @@ def _initialise(self):
         self.falling_event_ID = sm.events[self.falling_event] if self.falling_event in sm.events else False
         self.threshold_active = self.rising_event_ID or self.falling_event_ID
 
+    def run_start(self):
+        self.set_threshold(self.threshold)
+
     def _process_interrupt(self):
         # Put event generated by threshold crossing in event queue.
         if self.crossing_direction:
@@ -394,6 +399,15 @@ def set_threshold(self, threshold):
         self.threshold = threshold
         self.reset_above_threshold = True
 
+        fw.data_output_queue.put(
+            fw.Datatuple(
+                fw.current_time,
+                fw.PRINT_TYP,
+                "s",
+                "({}, {}) threshold = {}".format(self.rising_event, self.falling_event, self.threshold),
+            )
+        )
+
 
 class Crossing:
     above = "above"
@@ -420,12 +434,15 @@ class SchmittTrigger(IO_object):
     def __init__(self, bounds, rising_event=None, falling_event=None):
         if rising_event is None and falling_event is None:
             raise ValueError("Either rising_event or falling_event or both must be specified.")
-        self.set_bounds(bounds)
         self.rising_event = rising_event
         self.falling_event = falling_event
+        self.bounds = bounds
         self.timestamp = 0
         assign_ID(self)
 
+    def run_start(self):
+        self.set_bounds(self.bounds)
+
     def set_bounds(self, threshold):
         if isinstance(threshold, tuple):
             threshold_requirements_str = "The threshold must be a tuple of two integers (lower_bound, upper_bound) where lower_bound <= upper_bound."
@@ -444,6 +461,17 @@ def set_bounds(self, threshold):
             raise ValueError("{} is not a valid threshold. {}".format(threshold, threshold_requirements_str))
         self.reset_crossing = True
 
+        fw.data_output_queue.put(
+            fw.Datatuple(
+                fw.current_time,
+                fw.PRINT_TYP,
+                "s",
+                "({}, {}) bounds = ({},{})".format(
+                    self.rising_event, self.falling_event, self.upper_threshold, self.lower_threshold
+                ),
+            )
+        )
+
     def _initialise(self):
         # Set event codes for rising and falling events.
         self.rising_event_ID = sm.events[self.rising_event] if self.rising_event in sm.events else False