Fix AWG -> instrument side effects.

BBN-Q · Oct 18, 2016 · bcd8a8d · bcd8a8d
1 parent 6a4d0f2
commit bcd8a8d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/QGL/Compiler.py b/QGL/Compiler.py
@@ -250,7 +250,7 @@ def channel_delay_map(physicalWires):
 def setup_awg_channels(physicalChannels):
     translators = {}
     for chan in physicalChannels:
-        translators[chan.AWG] = import_module('QGL.drivers.' + chan.translator)
+        translators[chan.instrument] = import_module('QGL.drivers.' + chan.translator)
 
     data = {awg: translator.get_empty_channel_set()
             for awg, translator in translators.items()}
@@ -271,10 +271,10 @@ def bundle_wires(physWires, wfs):
     for chan in physWires.keys():
         _, awgChan = chan.label.split('-')
         awgChan = 'ch' + awgChan
-        awgData[chan.AWG][awgChan]['linkList'] = physWires[chan]
-        awgData[chan.AWG][awgChan]['wfLib'] = wfs[chan]
+        awgData[chan.instrument][awgChan]['linkList'] = physWires[chan]
+        awgData[chan.instrument][awgChan]['wfLib'] = wfs[chan]
         if hasattr(chan, 'correctionT'):
-            awgData[chan.AWG][awgChan]['correctionT'] = chan.correctionT
+            awgData[chan.instrument][awgChan]['correctionT'] = chan.correctionT
     return awgData
 
 

diff --git a/tests/test_Sequences.py b/tests/test_Sequences.py
@@ -382,15 +382,15 @@ def setUp(self):
             channelName = name + '-12'
             channel = PhysicalQuadratureChannel(label=channelName)
             channel.samplingRate = 1.2e9
-            channel.AWG = name
+            channel.instrument = name
             channel.translator = 'APS2Pattern'
             self.channels[channelName] = channel
 
             for m in range(1, 5):
                 channelName = "{0}-12m{1}".format(name, m)
                 channel = PhysicalMarkerChannel(label=channelName)
                 channel.samplingRate = 1.2e9
-                channel.AWG = name
+                channel.instrument = name
                 channel.translator = 'APS2Pattern'
                 self.channels[channelName] = channel
 
@@ -421,7 +421,7 @@ def setUp(self):
     def test_mux_CR(self):
         #control and CR sharing the same chans
         self.channels['cr'].physChan = self.channels['q1'].physChan
-        self.channels['q1'].frequency = 100e6 
+        self.channels['q1'].frequency = 100e6
         self.channels['cr'].frequency = 200e6
         ChannelLibrary.channelLib.build_connectivity_graph()
         seqs = [CNOT_CR(self.q1, self.q2)]
@@ -449,15 +449,15 @@ def setUp(self):
                 channelName = name + '-' + ch
                 channel = PhysicalQuadratureChannel(label=channelName)
                 channel.samplingRate = 1.2e9
-                channel.AWG = name
+                channel.instrument = name
                 channel.translator = 'APSPattern'
                 self.channels[channelName] = channel
 
             for m in range(1, 5):
                 channelName = "{0}-{1}m1".format(name, m)
                 channel = PhysicalMarkerChannel(label=channelName)
                 channel.samplingRate = 1.2e9
-                channel.AWG = name
+                channel.instrument = name
                 channel.translator = 'APSPattern'
                 self.channels[channelName] = channel
 
@@ -561,15 +561,15 @@ def setUp(self):
                 channelName = name + '-' + ch
                 channel = PhysicalQuadratureChannel(label=channelName)
                 channel.samplingRate = 1.2e9
-                channel.AWG = name
+                channel.instrument = name
                 channel.translator = 'TekPattern'
                 self.channels[channelName] = channel
 
             for m in ['1m1', '1m2', '2m1', '2m2', '3m1', '3m2', '4m1', '4m2']:
                 channelName = "{0}-{1}".format(name, m)
                 channel = PhysicalMarkerChannel(label=channelName)
                 channel.samplingRate = 1.2e9
-                channel.AWG = name
+                channel.instrument = name
                 channel.translator = 'TekPattern'
                 self.channels[channelName] = channel
 
@@ -710,13 +710,13 @@ def test_RB_SimultaneousRB_AC(self):
 # 			for ch in ['12']:
 # 				channelName = name + '-' + ch
 # 				channel = PhysicalQuadratureChannel(label=channelName)
-# 				channel.AWG = self.instruments[name]
+# 				channel.instrument = self.instruments[name]
 # 				self.channels[channelName] = channel
 
 # 			for m in ['1m1', '1m2', '2m1', '2m2']:
 # 				channelName = "{0}-{1}".format(name,m)
 # 				channel = PhysicalMarkerChannel(label=channelName)
-# 				channel.AWG = self.instruments[name]
+# 				channel.instrument = self.instruments[name]
 # 				self.channels[channelName] = channel
 
 # 		mapping = { 'digitizerTrig'	:'TEK1-1m2',