Move Barrier to QGL1.

src/python/pyqgl2/main.py

@@ -504,7 +504,7 @@ def countChannelsInSequences(seqs):
     from QGL.Channels import Qubit as qgl1Qubit
     from QGL.Channels import Edge
     from QGL.PatternUtils import flatten
-    from qgl2.qgl1control import Barrier
+    from qgl2.qgl1 import Barrier
     import collections
     import logging
 
@@ -605,7 +605,7 @@ def mapQubitsToSequences(seqs):
     from QGL.Compiler import find_unique_channels
     from QGL.Channels import Qubit as qgl1Qubit
     from QGL.Channels import Edge
-    from qgl2.qgl1control import Barrier
+    from qgl2.qgl1 import Barrier
     import copy
     import logging
 

src/python/qgl2/qgl1.py

@@ -149,8 +149,7 @@ def Wait() -> control:
 def Sync() -> control:
     print('Sync')
 
-# This function is QGL1 but only for use by QGL2
-@qgl2stub('qgl2.qgl1control')
+@qgl2stub('QGL.ControlFlow')
 def Barrier(chanlist: qreg) -> control:
     # chanlist is list of channels that are waiting here
     print('Barrier(%s)' % (chanlist))

test/helpers.py

@@ -9,9 +9,8 @@
 from QGL.PulseSequencer import Pulse, CompositePulse
 from QGL.PatternUtils import flatten
 from QGL.PulsePrimitives import Id, X, MEAS
-from QGL.ControlFlow import qsync, qwait, ControlInstruction, Goto
+from QGL.ControlFlow import qsync, qwait, ControlInstruction, Goto, Barrier
 from QGL.BlockLabel import BlockLabel
-from qgl2.qgl1control import Barrier
 
 import collections
 from math import pi

test/test_basic_mins.py

@@ -10,7 +10,6 @@
 from pyqgl2.main import compile_function
 from pyqgl2.qreg import QRegister
 from QGL import *
-from qgl2.qgl1control import Barrier
 
 from test.helpers import testable_sequence, \
     channel_setup, assertPulseSequenceEqual, \

test/test_multi.py

@@ -8,7 +8,6 @@
 from pyqgl2.main import compile_function
 
 from QGL import *
-from qgl2.qgl1control import Barrier
 
 class TestMulti(unittest.TestCase):
     def setUp(self):