nsqdriver 0.5.4__cp311-cp311-macosx_10_9_universal2.whl → 0.5.6__cp311-cp311-macosx_10_9_universal2.whl

nsqdriver/NS_MCI.py

@@ -203,13 +203,13 @@ class Driver(BaseDriver):
         values.update(system_parameter)
         for name, value in values.items():
             if value is not None:
-                self.handle.rpc_set(name, value, 0, False)
+                self.fast_rpc.rpc_set(name, value, 0, False)
         print_debug('Driver: 后端参数配置成功')
 
         # 系统开启前必须进行过一次初始化
         result &= self.__init_system()
         print_debug('Driver: 后端RF配置成功')
-        result &= self.handle.rpc_set('Reset')
+        result &= self.fast_rpc.rpc_set('Reset')
         print_debug('Driver: 后端缓存配置成功')
         return result
 
@@ -218,11 +218,7 @@ class Driver(BaseDriver):
         """
         关闭设备
         """
-        if getattr(self, 'handle', None) is not None:
-            self.handle.close()
-            self.handle = None
-        if getattr(self, 'fast_rpc', None) is not None:
-            self.fast_rpc = None
+        ...
 
     def write(self, name: str, value, **kw):
         channel = kw.get('ch', 1)

nsqdriver/NS_QSYNC.py

@@ -235,6 +235,12 @@ class Driver(BaseDriver):
             self.change_ref(value)
         elif name == 'UpdateFirmware':
             self.update_firmware(value)
+        elif name == 'SetMask':
+            if not isinstance(value, list):
+                print(f'SetMask set value {value} is not a list')
+                return
+            data = self.__fmt_qsync_mask(value)
+            self._send_command(data)
 
         else:
             self.param[name] = value
@@ -441,6 +447,18 @@ class Driver(BaseDriver):
 
         return struct.pack('=' + 'I' * len(cmd_pack), *cmd_pack)
 
+    @lru_cache(maxsize=32)
+    def __fmt_qsync_mask(self, mask: Tuple):
+        cmd_pack = (
+            0x5F5F5F5F,
+            0x51000001,
+            0x00000000,
+            80,
+            *mask
+        )
+
+        return struct.pack('=' + 'I' * len(cmd_pack), *cmd_pack)
+
     @lru_cache(maxsize=32)
     def __fmt_qsync_start(self, src, period, shots, width, delay):
         cmd_pack = (
@@ -669,3 +687,35 @@ class InfoSharedList:
 
 # threading.Thread(target=do_scanning, daemon=True, name='qsync_scanning_device').start()
 SHARED_DEVICE_MEM = InfoSharedList()
+
+
+if __name__ == '__main__':
+    ins = Driver('127.0.0.1')
+
+    count = 1024
+    period = 400e-6
+    delay = 0
+    source = 0
+
+    # ins.set('ResetTrig')
+
+    for ch in [1, 2, 3, 4, 5, 6, 7]:
+        ins.set('Shot', count, channel=ch)
+        ins.set('TrigPeriod', period, channel=ch)
+        ins.set('TrigDelay', delay, channel=ch)
+        ins.set('TrigFrom', source, channel=ch)
+
+    for ch in [8]:
+        ins.set('Shot', count, channel=ch)
+        ins.set('TrigWidth', 1600e-9, channel=ch)
+        ins.set('TrigPeriod', period, channel=ch)
+        ins.set('SubTriggerCount', 4, channel=ch)
+        ins.set('TrigDelayList', [1600e-9 * i for i in range(4)])
+        ins.set('TrigFrom', source, channel=ch)
+
+    for i in range(1):
+        # ins.set('GenerateTrig')
+        ins.set('GeneratePrtTrig')
+        import time
+
+        time.sleep(1)

nsqdriver/__init__.py

@@ -4,7 +4,7 @@ from .NS_CST import Driver as CSTDriver
 from .compiler.ns_wave import InsChannel
 from .compiler.py_wave_asm import nsw_config, AssemblyError
 
-version_pack = (0, 5, 4)
+version_pack = (0, 5, 6)
 
 __version__ = '.'.join(str(_) for _ in version_pack)
 __all__ = ['MCIDriver', 'QSYNCDriver', 'CSTDriver', 'InsChannel']

nsqdriver/wrapper/AWG_ADC.py

@@ -16,7 +16,7 @@ SEGMENT_ENABLE = False
 class DAChannelData:
     seg_waves: "Sized|Iterable[np.ndarray]" = tuple()
     delays: "Sized|Iterable[float]" = tuple()
-    data: np.ndarray = np.array([0])
+    data = np.array([0])
     updated: bool = False
 
     @property

{nsqdriver-0.5.4.dist-info → nsqdriver-0.5.6.dist-info}/METADATA

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

nsqdriver-0.5.6.dist-info/RECORD

@@ -0,0 +1,18 @@
+nsqdriver/NS_CST.py,sha256=_QYCjg1YglIJ4YVmxvISqvy5rExWGlMhyrK9zYIRbRY,7877
+nsqdriver/NS_MCI.py,sha256=LWaPn2XGjlT20gupsg8aDAvHVxmtmLehCmI63pt4m74,20791
+nsqdriver/NS_QSYNC.py,sha256=J1hlourlHPe_aNRPuSGRrpnA5kGt4zKM_V3yUb2928w,24748
+nsqdriver/__init__.py,sha256=ZajjfbYSJFDEPzyeyE1yut0SmLb96Tx3P-Xp1gWq9NQ,371
+nsqdriver/common.py,sha256=IHfShqgNN3THbe7KD7ICdfFY7JKC_kQj0_KJk-449gQ,499
+nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nsqdriver/compiler/assembler.cpython-311-darwin.so,sha256=nvddJithtDFiOQPId05lquYzKH11v5iEKJ5Kp1_Vaow,1059452
+nsqdriver/compiler/ns_wave.cpython-311-darwin.so,sha256=yToZmZhLothLeA7W6xfVIn0mdGjAV4vyhcjQYgQ4KEw,750906
+nsqdriver/compiler/ns_wave.pyi,sha256=JQiE_9HqCzm00bS6c2JaaIXwt7xN_x9XXax-BBrE7-o,3824
+nsqdriver/compiler/py_wave_asm.cpython-311-darwin.so,sha256=cgilh06mMH2tDzy4lpa-D7jBBnMnpagUffV6HGXaMqI,988830
+nsqdriver/compiler/py_wave_asm.pyi,sha256=w2PWlBrns4tfDYjTLyOBfNgjjjVA_xzMJZYYyDPKce4,656
+nsqdriver/wrapper/AWG_ADC.py,sha256=ktQkORc8VZUFkNg6huC7DKIkvZyHYXRolQ2SAA89JnM,19199
+nsqdriver/wrapper/ND_NSMCI.py,sha256=gTyrDObhbggl35V_q-kpDoPsfttIEnDFc6f0-pk_P0k,6288
+nsqdriver/wrapper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nsqdriver-0.5.6.dist-info/METADATA,sha256=k9n2QdjeYSTse4HpddhUYMFV4Gb6ER3XVN-MgD-OEnc,4359
+nsqdriver-0.5.6.dist-info/WHEEL,sha256=eupBwbXGAhwNAPJSvj5BiShZwdZO8jnQ5yHfv-9aUGw,115
+nsqdriver-0.5.6.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
+nsqdriver-0.5.6.dist-info/RECORD,,

nsqdriver-0.5.4.dist-info/RECORD

@@ -1,18 +0,0 @@
-nsqdriver/NS_CST.py,sha256=_QYCjg1YglIJ4YVmxvISqvy5rExWGlMhyrK9zYIRbRY,7877
-nsqdriver/NS_MCI.py,sha256=hS7BBeEDBWmwxWyVyxeulVTiLJ1pQc-HvBhHOBnDzww,20981
-nsqdriver/NS_QSYNC.py,sha256=YoulCgRt1uWZE7IAiIV2oeyMClFjmaCAXq9bNX3E5aI,23378
-nsqdriver/__init__.py,sha256=excOTsYL4owRhNZEndH4My8YKwfA6O2FoHgknQGSVls,371
-nsqdriver/common.py,sha256=IHfShqgNN3THbe7KD7ICdfFY7JKC_kQj0_KJk-449gQ,499
-nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsqdriver/compiler/assembler.cpython-311-darwin.so,sha256=22zVmMbQecYxkpCwTSkk88PrHp95LkMonMBr9_Niqm4,1059452
-nsqdriver/compiler/ns_wave.cpython-311-darwin.so,sha256=6qX6joP3HOBcnFSbPP744g9QnLzkhFpP7mmyeQILSYU,750906
-nsqdriver/compiler/ns_wave.pyi,sha256=JQiE_9HqCzm00bS6c2JaaIXwt7xN_x9XXax-BBrE7-o,3824
-nsqdriver/compiler/py_wave_asm.cpython-311-darwin.so,sha256=If_bpcIas1-K8Uw2_lLeXgeLKJG_a6AtAK6JqruW-Y0,988830
-nsqdriver/compiler/py_wave_asm.pyi,sha256=w2PWlBrns4tfDYjTLyOBfNgjjjVA_xzMJZYYyDPKce4,656
-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.5.4.dist-info/METADATA,sha256=T-SoAFjnBY3UyJBk7qlqYDiy1v2-788KetYm0sKtgCA,4359
-nsqdriver-0.5.4.dist-info/WHEEL,sha256=eupBwbXGAhwNAPJSvj5BiShZwdZO8jnQ5yHfv-9aUGw,115
-nsqdriver-0.5.4.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
-nsqdriver-0.5.4.dist-info/RECORD,,