Enable software gating of the outputs.

Adds enable flat to synth output that is
independent of the optional hardware-timed gate
provided by another digital output on the DDS.

Note, you will need to use WinfreakSynth.enable_output()
in scripts to enable the output at the device level.

Author: dihm

labscript_devices/Windfreak/blacs_tabs.py

@@ -13,7 +13,6 @@
 
 from blacs.device_base_class import DeviceTab
 
-import labscript_utils.properties
 
 class WindfreakSynthTab(DeviceTab):
 
@@ -28,9 +27,9 @@ def initialise_GUI(self):
         conn_obj = self.settings['connection_table'].find_by_name(self.device_name).properties
 
         self.allowed_chans = conn_obj.get('allowed_chans',None)
-        
+
         # finish populating these from device properties
-        chan_prop = {'freq':{},'amp':{},'phase':{}}
+        chan_prop = {'freq':{},'amp':{},'phase':{},'gate':{}}
         freq_limits = conn_obj.get('freq_limits',None)
         chan_prop['freq']['min'] = freq_limits[0]
         chan_prop['freq']['max'] = freq_limits[1]

labscript_devices/Windfreak/blacs_workers.py

@@ -14,6 +14,7 @@
 from blacs.tab_base_classes import Worker
 import labscript_utils.h5_lock, h5py
 
+
 class WindfreakSynthWorker(Worker):
 
     def init(self):
@@ -22,7 +23,8 @@ def init(self):
 
         # init smart cache to a known point
         self.smart_cache = {'STATIC_DATA':None}
-        self.subchnls = ['freq','amp','phase']
+        self.subchnls = ['freq','amp','phase','gate']
+        # this will be the order in which each channel is programmed
 
         Worker.init(self)
 
@@ -37,7 +39,7 @@ def init(self):
 
     def set_trigger_mode(self,mode):
         """Sets the synth trigger mode.
-        
+
         Provides basic error checking to confirm setting is valid.
 
         Args:
@@ -85,6 +87,8 @@ def check_remote_value(self,channel,type):
             return self.synth[channel].power
         elif type == 'phase':
             return self.synth[channel].phase
+        elif type == 'gate':
+            return self.synth[channel].rf_enable and self.synth[channel].pll_enable
         else:
             raise ValueError(type)
 
@@ -96,6 +100,9 @@ def program_static_value(self,channel,type,value):
             self.synth[channel].power = value
         elif type == 'phase':
             self.synth[channel].phase = value
+        elif type == 'gate':
+            self.synth[channel].rf_enable = value
+            self.synth[channel].pll_enable = value
         else:
             raise ValueError(type)
 
@@ -131,4 +138,4 @@ def transition_to_buffered(self, device_name, h5file, initial_values, fresh):
     def shutdown(self):
         # save current state the memory
         self.synth.save()
-        self.synth.close()
+        self.synth.close()

labscript_devices/Windfreak/labscript_devices.py

@@ -23,6 +23,7 @@ class WindfreakSynth(Device):
     allowed_children = [StaticDDS]
     # note, box labels 'A', 'B' map to programming channels 0, 1
     allowed_chans = [0, 1]
+    enabled_chans = []
 
     # define output limitations for the SynthHDPro
     freq_limits = (10e6, 24e9)  # set in Hz
@@ -124,14 +125,30 @@ def generate_code(self, hdf5_file):
 
         static_dtypes = [(f'freq{i:d}',np.float64) for i in self.allowed_chans] +\
                         [(f'amp{i:d}',np.float64) for i in self.allowed_chans] +\
-                        [(f'phase{i:d}',np.float64) for i in self.allowed_chans]
+                        [(f'phase{i:d}',np.float64) for i in self.allowed_chans] +\
+                        [(f'gate{i:d}',bool) for i in self.allowed_chans]
         static_table = np.zeros(1,dtype=static_dtypes)
 
         for connection in DDSs:
             static_table[f'freq{connection}'] = dds.frequency.raw_output
             static_table[f'amp{connection}'] = dds.amplitude.raw_output
             static_table[f'phase{connection}'] = dds.phase.raw_output
+            static_table[f'gate{connection}'] = self.enabled_chans[connection]
 
         grp = self.init_device_group(hdf5_file)
         grp.create_dataset('STATIC_DATA',compression=config.compression,data=static_table)
 
+    def enable_output(self, channel):
+        """Enable an output channel at the device level.
+
+        This is a software enable only, it cannot be hardware timed.
+
+        Args:
+            channel (int): Channel to enable.
+        """
+
+        if channel in self.allowed_chans:
+            if channel not in self.enabled_chans:
+                self.enabled_chans.append(channel)
+        else:
+            raise LabscriptError(f'Channel {channel} is not a valid option for {self.device.name}.')