Feature AWG - Tabor - Reworked implementation of the repetition modes

doc/source/examples/hardware/tabor.py

@@ -1,5 +1,5 @@
 from qupulse.hardware.setup import HardwareSetup, PlaybackChannel, MarkerChannel
-from qupulse.hardware.awgs.tabor import TaborChannelPair, TaborAWGRepresentation
+from qupulse.hardware.awgs.tabor import TaborAWGRepresentation
 import pyvisa
 
 

qupulse/_program/seqc.py

@@ -34,6 +34,7 @@
 from qupulse.utils import replace_multiple, grouper
 from qupulse._program.waveforms import Waveform
 from qupulse._program._loop import Loop
+
 from qupulse._program.volatile import VolatileRepetitionCount, VolatileProperty
 from qupulse.hardware.awgs.base import ProgramEntry
 

qupulse/_program/tabor.py

@@ -8,6 +8,7 @@
 
 import numpy as np
 
+from qupulse.hardware.feature_awg.features import RepetitionMode
 from qupulse.utils.types import ChannelID, TimeType
 from qupulse.hardware.awgs.base import ProgramEntry
 from qupulse.hardware.util import get_sample_times, voltage_to_uint16
@@ -389,7 +390,7 @@ def __init__(self,
                  voltage_transformations: Tuple[Optional[callable], Optional[callable]],
                  sample_rate: TimeType,
                  mode: TaborSequencing = None,
-                 repetition_mode: str = "infinite",
+                 repetition_mode: Union[str, RepetitionMode] = "infinite",
                  ):
         if len(channels) != device_properties['chan_per_part']:
             raise TaborException('TaborProgram only supports {} channels'.format(device_properties['chan_per_part']))
@@ -420,7 +421,7 @@ def __init__(self,
         self._parsed_program = None  # type: Optional[ParsedProgram]
         self._mode = None
         self._device_properties = device_properties
-        self._repetition_mode = repetition_mode
+        self._repetition_mode = RepetitionMode(repetition_mode)
 
         assert mode in (TaborSequencing.ADVANCED, TaborSequencing.SINGLE), "Invalid mode"
         if mode == TaborSequencing.SINGLE:

qupulse/hardware/awgs/__init__.py

@@ -4,7 +4,7 @@
 __all__ = ["install_requirements"]
 
 try:
-    from qupulse.hardware.awgs.tabor import TaborAWGRepresentation, TaborChannelPair
+    from qupulse.hardware.feature_awg.tabor import TaborDevice, TaborChannelTuple
     __all__.extend(["TaborAWGRepresentation", "TaborChannelPair"])
 except ImportError:
     pass

qupulse/hardware/feature_awg/base.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import Optional, Collection
+from typing import Optional, Collection, Union
 import weakref
 
 from qupulse.hardware.awgs.base import AWG
@@ -11,14 +11,16 @@
 
 class AWGDeviceFeature(Feature):
     """Base class for features that are used for `AWGDevice`s"""
-    def __init__(self):
+    def __init__(self, device: 'AWGDevice'):
         super().__init__(AWGDevice)
+        self._device = weakref.proxy(device)
 
 
 class AWGChannelFeature(Feature):
     """Base class for features that are used for `AWGChannel`s"""
-    def __init__(self):
+    def __init__(self, channel: Union['AWGChannel', 'AWGMarkerChannel']):
         super().__init__(_BaseAWGChannel)
+        self._channel = weakref.proxy(channel)
 
 
 class AWGChannelTupleFeature(Feature):

qupulse/hardware/feature_awg/features.py

@@ -4,8 +4,8 @@
 from enum import Enum
 
 from qupulse._program._loop import Loop
-from qupulse.hardware.feature_awg.base import AWGDeviceFeature, AWGChannelFeature, AWGChannelTupleFeature,\
-    AWGChannelTuple
+from qupulse.hardware.feature_awg.base import AWGDeviceFeature, AWGChannelFeature, AWGChannelTupleFeature, \
+    AWGChannelTuple, AWGDevice
 from qupulse.utils.types import ChannelID
 
 try:
@@ -24,8 +24,8 @@ class SCPI(AWGDeviceFeature, ABC):
     https://en.wikipedia.org/wiki/Standard_Commands_for_Programmable_Instruments
     """
 
-    def __init__(self, visa: 'pyvisa.resources.MessageBasedResource'):
-        super().__init__()
+    def __init__(self, device: 'AWGDevice', visa: 'pyvisa.resources.MessageBasedResource'):
+        super().__init__(device)
         self._socket = visa
 
     def send_cmd(self, cmd_str):