nsqdriver 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

nsqdriver/NS_MCI.py

@@ -336,9 +336,9 @@ class Driver(BaseDriver):
         _string = [f'*********设备{self.addr}开启成功*********']
         for key in keys:
             _string.append(f'{key}: {status.get(key, "nan")}')
-        for i in range(len(status['rfsoc_addr'])):
-            _string.append(f'sub_device{status["rfsoc_addr"][i]}: '
-                           f'{status["ref_clock_lock"][i]}{status["ref_clock_from"][i]}')
+        # for i in range(len(status['rfsoc_addr'])):
+        #     _string.append(f'sub_device{status["rfsoc_addr"][i]}: '
+        #                    f'{status["ref_clock_lock"][i]}{status["ref_clock_from"][i]}')
         print('\n'.join(_string))
 
 

nsqdriver/NS_QSYNC.py

@@ -54,8 +54,8 @@ def retry(times):
 
 class Driver(BaseDriver):
     class ScannMode(enum.IntEnum):
-        """
-        QC/QR等被同步设备的发现方式，'local': 本地共享内存扫描， 'remote': 网络udp扫描
+        """!
+        @detail QC/QR等被同步设备的发现方式，'local': 本地共享内存扫描， 'remote': 网络udp扫描
         """
         local = 0
         """local: 本地共享内存扫描
@@ -98,6 +98,8 @@ class Driver(BaseDriver):
         Quantity('ResetTrig', value=None),
         Quantity('Shot', value=1024, ch=1),  # set/get, 运行次数
         Quantity('TrigPeriod', value=200e-6, ch=1),  # set/get, 触发周期
+        Quantity('TrigWidth', value=800e-9, ch=1),  # set/get, 触发周期
+        Quantity('TrigDelay', value=0, ch=1),  # set/get, 触发周期
         Quantity('TrigFrom', value=0, ch=1),  # Trig来源： 0：内部产生；1：外部输入
         Quantity('RefClock', value='out', ch=1),  # 参考时钟选择： ‘out’：外参考时钟；‘in’：内参考时钟
         Quantity('DiscoveryMode', value=ScannMode.local, ch=1),  # QC/QR等被同步设备的发现方式，见DiscoveryMode说明
@@ -107,7 +109,9 @@ class Driver(BaseDriver):
     SystemParameter = {
         'RefClock': 'out',  # 参考时钟选择： ‘out’：外参考时钟；‘in’：内参考时钟
         'TrigFrom': 0,  # Trig来源： 0：内部产生；1：外部输入
-        'TrigPeriod': 200e-6,
+        'TrigPeriod': 200e-6,  # 触发信号重复周期
+        'TrigWidth': 800e-9,  # 触发信号高电平宽度 单位s
+        'TrigDelay': 0,  # 触发信号相对开启通知的延迟
         'DiscoveryMode': ScannMode.local,  # QC/QR等被同步设备的发现方式，见DiscoveryMode说明
     }
 
@@ -119,7 +123,7 @@ class Driver(BaseDriver):
         self.gen_trig_num = 0
         self.addr = addr
 
-        self.param = {'shots': 1024, 'period': 200e-6, 'MixMode': 2}
+        self.param = {'Shot': 1024, 'period': 200e-6, 'MixMode': 2}
         print_debug(f'QSYNC: 实例化成功{addr}')
 
     @property
@@ -138,9 +142,11 @@ class Driver(BaseDriver):
             return set()
 
     def open(self, **kw):
-        """
+        """!
         输入IP打开设备，配置默认超时时间为5秒
         打开设备时配置RFSoC采样时钟，采样时钟以参数定义
+        @param kw:
+        @return:
         """
         # 配置系统初始值
         system_parameter = kw.get('system_parameter', {})
@@ -175,20 +181,30 @@ class Driver(BaseDriver):
         return result
 
     def set(self, name, value=None, channel=1):
-        """
+        """!
         设置设备属性
+        @param name:
+        @param value:
+        @param channel:
+        @return:
         """
         print_debug(f'QSYNC: set操作被调用{name}')
         if name in {'SystemSync', 'ReInit'}:
             self.sync_system()
         elif name == 'TRIG':
             value = self.param['TrigPeriod']
-            data = self.__fmt_qsync_start(self.param['TrigFrom'], value, self.param['Shot'])
+            data = self.__fmt_qsync_start(
+                self.param['TrigFrom'], value, self.param['Shot'],
+                self.param['TrigWidth'], self.param['TrigDelay']
+            )
             self._send_command(data, connect_timeout=2)
             self.gen_trig_num += 1
         elif name == 'GenerateTrig':
             value = self.param['TrigPeriod'] if value is None else value
-            data = self.__fmt_qsync_start(self.param['TrigFrom'], value, self.param['Shot'])
+            data = self.__fmt_qsync_start(
+                self.param['TrigFrom'], value, self.param['Shot'],
+                self.param['TrigWidth'], self.param['TrigDelay']
+            )
             self._send_command(data, connect_timeout=2)
             self.gen_trig_num += 1
         elif name == 'ResetTrig':
@@ -203,8 +219,12 @@ class Driver(BaseDriver):
             self.param[name] = value
 
     def get(self, name, channel=1, value=0):
-        """查询设备属性，获取数据
-
+        """!
+        查询设备属性，获取数据
+        @param name:
+        @param channel:
+        @param value:
+        @return:
         """
         print_debug(f'QSYNC: get操作被调用{name}')
         if name == 'Status':
@@ -250,11 +270,11 @@ class Driver(BaseDriver):
         self._send_command(data)
 
     def _sendto_device(self, cmd_head, timeout=2):
-        """
+        """!
         将指令发送给设备
-
-        :param cmd_head:
-        :return:
+        @param cmd_head:
+        @param timeout:
+        @return:
         """
         cmd_data = self.__fmt_qsync_common(cmd_head)
         devices = list(self.device_set)
@@ -283,11 +303,11 @@ class Driver(BaseDriver):
         return result
 
     def _sendto_qsync(self, cmd_head: int):
-        """
+        """!
         将指令发送给qsync
 
-        :param cmd_head:
-        :return:
+        @param cmd_head:
+        @return:
         """
         cmd_data = self.__fmt_qsync_common(cmd_head)
         if not self._send_command(cmd_data, connect_timeout=2):
@@ -296,12 +316,12 @@ class Driver(BaseDriver):
         return True
 
     def update_firmware(self, file_path, boards=None):
-        """
+        """!
         固件更新
 
-        :param file_path: 固件路径
-        :param boards:
-        :return:
+        @param file_path: 固件路径
+        @param boards:
+        @return:
         """
         import os
         if not os.path.exists(file_path):
@@ -312,12 +332,12 @@ class Driver(BaseDriver):
             print(f'qsync: 固件更新 执行失败')
 
     def _connect(self, addr=None, port=5001, timeout=None):
-        """
+        """!
         获取到指定ip的tcp连接
 
-        :param addr:
-        :param port:
-        :return:
+        @param addr:
+        @param port:
+        @return:
         """
         timeout = self.timeout if timeout is None else timeout
         addr = self.addr if addr is None else addr
@@ -329,15 +349,16 @@ class Driver(BaseDriver):
     @retry(3)
     def _send_command(self, data: Union[str, bytes], wait=0, addr=None, port=5001,
                       check_feedback=True, return_fdk=False, connect_timeout=10):
-        """
+        """!
         发送指定内容到后端
 
-        :param data: 指令内容
-        :param wait: 指令发送完成后，等待一段时间再接收反馈，阻塞式等待
-        :param addr: 后端IP
-        :param port: 后端端口
-        :param 是否解析反馈
-        :return:
+        @param data: 指令内容
+        @param wait: 指令发送完成后，等待一段时间再接收反馈，阻塞式等待
+        @param addr: 后端IP
+        @param port: 后端端口
+        @param check_feedback: 是否解析反馈
+        @param connect_timeout:
+        @return:
         """
         command_bak = data
         try:
@@ -400,15 +421,17 @@ class Driver(BaseDriver):
         return struct.pack('=' + 'I' * len(cmd_pack), *cmd_pack)
 
     @lru_cache(maxsize=32)
-    def __fmt_qsync_start(self, src, period, shots):
+    def __fmt_qsync_start(self, src, period, shots, width, delay):
         cmd_pack = (
             0x5F5F5F5F,
             0x41000001,
             0x00000000,
-            28,
+            36,
             int(src),
             int(period * 1e9) & 0xFFFFFFFF,
-            int(shots)
+            int(shots),
+            int(width * 1e9) & 0xFFFFFFFF,
+            int(delay * 1e9) & 0xFFFFFFFF
         )
 
         return struct.pack('=' + 'I' * len(cmd_pack), *cmd_pack)
@@ -433,10 +456,12 @@ class Driver(BaseDriver):
         self.set('TrigPeriod', 1 / rate)
         self.set('GenerateTrig')
 
-    def BurstMode_init(self, count=2048, delay=200e-6, period=200e-6, **kwds):
+    def BurstMode_init(self, count=2048, delay=200e-6, period=200e-6, source=0, **kwds):
         self.set('ResetTrig')
         self.set('Shot', count)
         self.set('TrigPeriod', period)
+        self.set('TrigDelay', delay)
+        self.set('TrigFrom', source)
 
     def startGun(self):
         self.Trigger_singleshot()
@@ -479,8 +504,8 @@ def do_scanning():
 
 
 class DeviceCmdHandle:
-    """
-    封装与QC/QR设备间的交互
+    """!
+    @brief 封装与QC/QR设备间的交互
     """
     error_map = {b'\x1a\x00\x001': {1: '指令Resync执行失败',
                                     2: 'REFCLK not Detected',
@@ -541,17 +566,17 @@ class DeviceCmdHandle:
     @classmethod
     def send_command(cls, data: Union[str, bytes], wait=0, addr=None, port=5001,
                      check_feedback=True, return_fdk=False, connect_timeout=None):
-        """
+        """!
         发送指定内容到后端
 
-        :param data: 指令内容
-        :param wait: 指令发送完成后，等待一段时间再接收反馈，阻塞式等待
-        :param addr: 后端IP
-        :param port: 后端端口
-        :param check_feedback:
-        :param return_fdk:
-        :param connect_timeout:
-        :return:
+        @param data: 指令内容
+        @param wait: 指令发送完成后，等待一段时间再接收反馈，阻塞式等待
+        @param addr: 后端IP
+        @param port: 后端端口
+        @param check_feedback:
+        @param return_fdk:
+        @param connect_timeout:
+        @return:
         """
         command_bak = data
         try:

nsqdriver/__init__.py

@@ -1,7 +1,7 @@
 from .NS_MCI import Driver as MCIDriver
 from .NS_QSYNC import Driver as QSYNCDriver
 
-version_pack = (0, 2, 3)
+version_pack = (0, 2, 5)
 
 __version__ = '.'.join(str(_) for _ in version_pack)
 __all__ = ['MCIDriver', 'QSYNCDriver', '__version__']

nsqdriver/wrapper/ND_NSMCI.py

@@ -0,0 +1,245 @@
+import numpy as np
+from nsqdriver import MCIDriver, QSYNCDriver
+
+
+class _XYChannel:
+    def __init__(self, mci: "DeviceBase", ch=1):
+        self.mci = mci
+        self.ch = ch
+        self.to_zero = np.zeros((16,))
+        self.to_one = np.ones((16,))
+        self.en = True
+        self.mode = 0
+        self.off = 0
+
+    def wave(self, w):
+        self.wavex(w, self.ch)
+
+    def wavex(self, w, idx):
+        if np.max(np.abs(w)) < 1e-30:
+            wr = np.zeros(16)
+        else:
+            wr = w
+        self.mci.mci_driver.set("Waveform", wr, idx)
+
+    def arm(self, k=None):
+        self.mci.mci_driver.set('PushWaveCache')
+
+    def trig_del(self, delay):
+        ...
+
+    def output_del(self, delay):
+        ...
+
+    def __del__(self):
+        pass
+
+    def output(self, b):
+        self.en = bool(b)
+        if not self.en:
+            self.mci.mci_driver.set("Waveform", self.to_zero, self.ch)
+
+    def mode(self, m_):
+        ...
+
+    def offsetx(self, off, idx):
+        self.mci.mci_driver.set('Waveform', off*self.to_one, idx)
+        self.off = off
+
+    def offset(self, off):
+        self.offsetx(off, self.ch)
+
+    W = {
+        "wave": wave,
+        "output": output,
+        "trig_del": trig_del,
+        "output_del": output_del,
+        "mode": mode,
+        "offset": offset,
+    }
+
+    Q = {"arm": arm}
+
+
+class _ZChannel(_XYChannel):
+    pass
+
+
+class _Probe:
+    def __init__(self, mci: "DeviceBase", ch=1):
+        self.mci = mci
+        self.ch = ch
+        self.freqList = []
+        self.SGS = None  # single shot temp cache
+        self.AVG = None  # average temp cache
+        self.depth = 2000
+        self._width = 1000
+        self.start = 500
+        self.demod = 1
+        self.averaged_I = np.zeros((16384, ))  # 直播直采，相当于只有I路数据
+
+    def depth(self, depth_):
+        self.depth = depth_
+        self.mci.mci_driver.set('PointNumber', depth_, self.ch)
+
+    def demodulation_on(self, demod_):
+        self.demod = int(demod_)
+
+    def start(self, start_):
+        self.start = start_
+        self.mci.mci_driver.set('TriggerDelay', start_, self.ch)
+
+    def width(self, width_):
+        self._width = width_/4e9
+        self.mci.mci_driver.set('PointNumber', width_, self.ch)
+
+    def freqs(self, *freqList_):
+        self.freqList = freqList_
+        self.mci.mci_driver.set('FreqList', freqList_, self.ch)
+
+    def shot(self, _shot):
+        self.mci.mci_driver.set('Shot', _shot)
+
+    def measure(self, k=None):
+        self.mci.mci_driver.set('StartCapture')
+        if self.demod:
+            self.SGS = self.mci.mci_driver.get('IQ', self.ch)
+            self.AVG = np.mean(self.SGS, axis=0)
+        else:
+            self.averaged_I = np.mean(self.mci.mci_driver.get('TraceIQ', self.ch), axis=0)
+
+    def single_shot(self, k=None):
+        return self.SGS
+
+    def average(self, k=None):
+        return self.AVG
+
+    def trace_I(self, k=None):
+        return self.averaged_I
+
+    def trace_Q(self, k=None):
+        return self.averaged_I
+
+    def __del__(self):
+        pass
+
+    W = {
+        "demod": demodulation_on,
+        "depth": depth,
+        "width": width,
+        "start": start,
+        "freqs": freqs,
+        "shot": shot,
+    }
+
+    Q = {
+        "measure": measure,
+        "A": average,
+        "S": single_shot,
+        "traceI": trace_I,
+        "traceQ": trace_Q
+    };
+
+
+# one box need one class
+class DeviceBase:
+    def __init__(self):
+        self.mci_driver = MCIDriver('127.0.0.1')
+        self.qsync_driver = QSYNCDriver('127.0.0.1')
+
+
+class NS_MCI(DeviceBase):
+    def __init__(self, addr, srate=10e9, mixmode=2, ref_clk='in'):
+        """!
+        此类涉及到系统同步，放到最后实例化
+        @param addr: 设备ip
+        @param srate: OUT通道采样率
+        @param mixmode: 为2时开启OUT通道混合模式，增强第二奈奎斯特区输出
+        @param ref_clk: 设备参考信号来源，不接外输出100M时都配置为'in'
+        """
+        super(NS_MCI, self).__init__()
+        self.mci_driver = MCIDriver(addr)
+        self.qsync = QSYNCDriver(addr)
+        self.srate = srate
+        self.mixmode = mixmode
+        self.ref_clk = ref_clk
+        self.connect()
+
+    def connect(self):
+        mci_params = {'DArate': self.srate, 'MixMode': self.mixmode}
+        qsync_params = {'RefClock': self.ref_clk}
+
+        self.qsync.open(system_parameter=qsync_params)
+        self.mci_driver.open(system_parameter=mci_params)
+        self.qsync.sync_system()
+
+        self.mci_driver.set('EnableWaveCache', True)
+
+        for _ch in range(22):
+            xy_ch = _ch+1
+            setattr(self, f'OUT{xy_ch}', _XYChannel(self, xy_ch))
+        for _ch in range(2):
+            probe_ch = _ch+1
+            setattr(self, f'IN{probe_ch}', _Probe(self, probe_ch))
+
+    def trig_interval(self, interval):
+        self.interval = interval
+        self.qsync.set('TrigPeriod', int(interval))
+
+    def trig_count(self, count_):
+        self.qsync.set('Shot', int(count_))
+
+    def trig(self):
+        self.qsync.set('GenerateTrig', self.interval)
+
+    def awg_arm(self):
+        self.mci_driver.set('PushWaveCache')
+
+    def __del__(self):
+        pass
+
+    W = {
+        "trig_interval": trig_interval,
+        "trig_count": trig_count,
+        "connect": connect,
+        "trig": trig,
+        "awg_arm": awg_arm,
+    }
+
+    Q = {
+    }
+
+
+class NS_Z(DeviceBase):
+    def __init__(self, addr, mixmode=2):
+        """!
+        此类负责控制24 Z OUT通道的设备，采样率固定为2Gsps，mixmode固定为1
+        @param addr: 设备ip
+        @param mixmode: 为1时关闭OUT通道混合模式
+        """
+        super(NS_Z, self).__init__()
+        self.mci_driver = MCIDriver(addr)
+        self.qsync = QSYNCDriver(addr)
+        self.srate = 2e9
+        self.mixmode = 1
+        self.connect()
+
+    def connect(self):
+        mci_params = {'DArate': self.srate, 'MixMode': self.mixmode}
+        self.mci_driver.open(system_parameter=mci_params)
+
+        self.mci_driver.set('EnableWaveCache', True)
+
+        for _ch in range(24):
+            xy_ch = _ch+1
+            setattr(self, f'OUT{xy_ch}', _ZChannel(self, xy_ch))
+
+    def awg_arm(self):
+        self.mci_driver.set('PushWaveCache')
+
+    W = {
+        "connect": connect,
+    }
+
+    Q = {
+    }

{nsqdriver-0.2.3.dist-info → nsqdriver-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nsqdriver
-Version: 0.2.3
+Version: 0.2.5
 Summary: Naishu Q series quantum measurement and control equipment driver interface
 Home-page: https://g2hoyqcmh4.feishu.cn/wiki/wikcnzvyMd82DLZUe2NsI6HxsFc
 Author: Naishu Technology

nsqdriver-0.2.5.dist-info/RECORD

@@ -0,0 +1,12 @@
+nsqdriver/NS_MCI.py,sha256=42w7Oj15Nq7bG4oZnyXUD2dDFyqsKA4rpaQDAIXQ5h0,19233
+nsqdriver/NS_QSYNC.py,sha256=P5BDiTz7hu6omwFnjGfGXfnzAoBfrvGYAYLTT45RoOc,22747
+nsqdriver/__init__.py,sha256=cBgsySikxDbYiCaL6hMnLaDQcRKzP6nkL0cPXwpajOo,218
+nsqdriver/common.py,sha256=IHfShqgNN3THbe7KD7ICdfFY7JKC_kQj0_KJk-449gQ,499
+nsqdriver/setup.py,sha256=4ajKQtY4hr2240f5sA81f66_92Yp_wG6gPM-zsOWq9M,390
+nsqdriver/wrapper/AWG_ADC.py,sha256=8K5xLEa_3CKnStWcoJeTj8ufEQfrx6o4l4XGNuOP3Ug,19211
+nsqdriver/wrapper/ND_NSMCI.py,sha256=gTyrDObhbggl35V_q-kpDoPsfttIEnDFc6f0-pk_P0k,6288
+nsqdriver/wrapper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nsqdriver-0.2.5.dist-info/METADATA,sha256=bt2XXWj4XGSbXAZeWO8hqQq6WMUgSSGceaeFjVQ2x8g,596
+nsqdriver-0.2.5.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+nsqdriver-0.2.5.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
+nsqdriver-0.2.5.dist-info/RECORD,,

nsqdriver-0.2.3.dist-info/RECORD

@@ -1,11 +0,0 @@
-nsqdriver/NS_MCI.py,sha256=9UhDyEdnoe2pLXzOMqZqHBbwLlY9Vtv572fnet5il-I,19227
-nsqdriver/NS_QSYNC.py,sha256=9LsT-O3asvpDno8W9y7fVyA5MKRsO79H1UEqIPGOKsc,21753
-nsqdriver/__init__.py,sha256=ryKIcb2l_iw4KrhuWU_dTmoCp9hLRm3d2XzagEdH8zU,218
-nsqdriver/common.py,sha256=IHfShqgNN3THbe7KD7ICdfFY7JKC_kQj0_KJk-449gQ,499
-nsqdriver/setup.py,sha256=4ajKQtY4hr2240f5sA81f66_92Yp_wG6gPM-zsOWq9M,390
-nsqdriver/wrapper/AWG_ADC.py,sha256=8K5xLEa_3CKnStWcoJeTj8ufEQfrx6o4l4XGNuOP3Ug,19211
-nsqdriver/wrapper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsqdriver-0.2.3.dist-info/METADATA,sha256=6nAvOX7mK5ys-BFn_GkAtJAjzLIdWxOoyLxJgM20X7I,596
-nsqdriver-0.2.3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-nsqdriver-0.2.3.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
-nsqdriver-0.2.3.dist-info/RECORD,,