nsqdriver 0.0.241__cp310-cp310-win_amd64.whl → 0.0.300__cp310-cp310-win_amd64.whl

nsqdriver/NS_DDS_v3.py

@@ -4,7 +4,6 @@ from math import ceil
 from collections import namedtuple
 from waveforms import Waveform, wave_eval, WaveVStack
 from waveforms.waveform import _zero
-from waveforms.math.signal import getFTMatrix, shift
 import nsqdriver.nswave as nw
 
 import numpy as np
@@ -39,77 +38,6 @@ except ImportError as e:
 DEBUG_PRINT = False
 
 
-def get_coef(coef_info, sampleRate):
-    start, stop = coef_info['start'], coef_info['stop']
-    numberOfPoints = int(
-        (stop - start) * sampleRate)
-    if numberOfPoints % 64 != 0:
-        numberOfPoints = numberOfPoints + 64 - numberOfPoints % 64
-    t = np.arange(numberOfPoints) / sampleRate + start
-
-    fList = []
-    wList = []
-    phases = []
-
-    for kw in coef_info['wList']:
-        Delta, t0, weight, w, phase = kw['Delta'], kw['t0'], kw['weight'], kw['w'], kw['phase']
-        fList.append(Delta)
-
-        if w is not None:
-            w = np.zeros(numberOfPoints, dtype=complex)
-            w[:len(w)] = w
-            w = shift(w, t0 - start)
-            phases.append(np.mod(phase + 2 * np.pi * Delta * start, 2 * np.pi))
-        else:
-            weight = weight
-            if isinstance(weight, np.ndarray):
-                pass
-            else:
-                if isinstance(weight, str):
-                    fun = wave_eval(weight) >> t0
-                elif isinstance(weight, Waveform):
-                    fun = weight >> t0
-                else:
-                    raise TypeError(f'Unsupported type {weight}')
-                weight = fun(t)
-            phase += 2 * np.pi * Delta * start
-            w = getFTMatrix([Delta],
-                            numberOfPoints,
-                            phaseList=[phase],
-                            weight=weight,
-                            sampleRate=sampleRate)[:, 0]
-            phases.append(np.mod(phase, 2 * np.pi))
-        wList.append(w)
-    return np.asarray(wList), fList, numberOfPoints, phases, round((stop - t0) * sampleRate), t
-
-
-def get_demod_envelope(coef_info, demod_map, sampleRate):
-    start, stop = coef_info['start'], coef_info['stop']
-    t0 = coef_info['t0']
-    numberOfPoints = int(
-        (stop - start) * sampleRate)
-    if numberOfPoints % 64 != 0:
-        numberOfPoints = numberOfPoints + 64 - numberOfPoints % 64
-    t = np.arange(numberOfPoints) / sampleRate + start
-    demod_map_list = demod_map
-    weight_sum = np.empty(numberOfPoints)
-    for weight in demod_map_list:
-        if isinstance(weight, np.ndarray):
-            pass
-        else:
-            if isinstance(weight, str):
-                fun = wave_eval(weight)
-            elif isinstance(weight, Waveform):
-                fun = weight
-            else:
-                raise TypeError(f'Unsupported type {weight}')
-            weight = fun(t)
-            weight_sum += weight
-    return weight_sum
-
-
-
-
 @nw.kernel
 def program_cap(param: nw.Var):
     #
@@ -129,17 +57,16 @@ def program_da(p: nw.Var):
     nw.init_frame(0, 0)
     nw.wait_for_trigger()
     # nw.reset_frame()
-    e = nw.ins_envelope(p[0][1])
     for i in p:
         nw.wait(i[0])
-        # e = nw.ins_envelope(i[1])
+        e = nw.ins_envelope(i[1])
         nw.play_wave(e, 1, 0, 0)
 
 
-ProbeSegment = namedtuple('ProbeSegment', ['start', 'stop', 'freq', 'demod', 'idx'])
+ProbeSegment = namedtuple('ProbeSegment', ['start', 'stop', 'freq', 'idx'])
 
 CaptureCmd = namedtuple('CaptureCmd', [
-    'start', 'ad_duration', 'delay', 'da_duration', 'freqs', 'delays', 'demod_wave_list', 'idx_list'
+    'start', 'ad_duration', 'delay', 'da_duration', 'freqs', 'delays', 'idx_list'
 ])
 
 
@@ -222,7 +149,6 @@ class Driver(BaseDriver):
         self.IQ_cache = {}
         self.coef_cache = {}
         self.res_maps = {}
-        self.demod_maps = {}
         self.probe_da_wave = {}
         # self.probe_delay = 32e-9
         self.probe_delay = 0
@@ -230,7 +156,6 @@ class Driver(BaseDriver):
         self.capture_cali_param: "dict[int, np.ndarray]" = {}
         self.capture_points: "dict[int, np.ndarray]" = {}
         self.demodulate_mode = DemodulateMode.MORE_QUBIT
-        self.demode_calculus: "dict[int, np.ndarray]" = {}
 
     def open(self, **kw):
         """
@@ -277,7 +202,7 @@ class Driver(BaseDriver):
             _start, _stop = int(round(_start * 1e9)), int(round(_stop * 1e9))
 
             # 将区间加入列表
-            seg = ProbeSegment(t0 + _start, t0 + _stop, wave['Delta'], weight_expr, idx)
+            seg = ProbeSegment(t0 + _start, t0 + _stop, wave['Delta'], idx)
             time_segments.append(seg)
 
         # 按起始时间排序
@@ -286,9 +211,9 @@ class Driver(BaseDriver):
         # 结果存储
         non_overlapping_segments: list[CaptureCmd] = []
         current_start, current_end = time_segments[0].start, time_segments[0].stop
-        current_cmd = CaptureCmd(0, 0, 0, 0, [time_segments[0].freq], [0.],[time_segments[0].demod],
-                                 [time_segments[0].idx])
+        current_cmd = CaptureCmd(0, 0, 0, 0, [time_segments[0].freq], [0.], [time_segments[0].idx])
         pointer = 0
+
         for seg in time_segments[1:]:
             if seg.start > current_end:
                 # 如果不重叠，保存当前段并移动到下一段
@@ -299,10 +224,9 @@ class Driver(BaseDriver):
                 current_cmd = current_cmd._replace(ad_duration=current_end - current_start)
                 current_cmd = current_cmd._replace(delay=self.probe_delay)
                 current_cmd = current_cmd._replace(da_duration=current_end - current_start)
-                current_cmd = current_cmd._replace(demod_wave_list=[time_segments[0].demod])
                 non_overlapping_segments.append(current_cmd)
 
-                current_cmd = CaptureCmd(0, 0, 0, 0, [seg.freq], [0.], [seg.demod], [seg.idx])
+                current_cmd = CaptureCmd(0, 0, 0, 0, [seg.freq], [0.], [seg.idx])
                 pointer = current_end
                 current_start, current_end = seg.start, seg.stop
             else:
@@ -310,7 +234,6 @@ class Driver(BaseDriver):
                 current_end = max(current_end, seg.stop)
                 current_cmd.idx_list.append(seg.idx)
                 current_cmd.freqs.append(seg.freq)
-                current_cmd.demod_wave_list.append(seg.demod)
                 # 由delay换算解缠绕相位
                 current_cmd.delays.append(seg.start - current_start)
         else:
@@ -324,14 +247,11 @@ class Driver(BaseDriver):
 
     def generate_in_program(self, coef_info, ch):
         freq_map = []
-        demod_wave_map = []
         seq_param = []
 
         self.capture_cmds[ch] = seq = self.in_sequence_in_time(coef_info)
 
         for segment in seq:
-            demod_wave_map.extend(segment.demod_wave_list)
-            demod_wave_map = list(set(demod_wave_map))
             freq_map.extend(segment.freqs)
             freq_map = list(set(freq_map))
 
@@ -340,9 +260,9 @@ class Driver(BaseDriver):
         phase_map = [0]*len(coef_info['wList'])
         points_map = [0]*len(coef_info['wList'])
         for cap_num, segment in enumerate(seq):
-            _align_start = self.granularity4ns(segment.start)  # 向前取整
+            _align_start = self.granularity4ns(segment.start)
             _start_diff = segment.start - _align_start
-            _align_end = ceil((segment.start+segment.ad_duration)/4)*4  #向上取整
+            _align_end = ceil((segment.start+segment.ad_duration)/4)*4
             seq_param.append([
                 (_align_start-_t_end)*1e-9,
                 (_align_end-_align_start)*1e-9,
@@ -350,16 +270,15 @@ class Driver(BaseDriver):
                 (_align_end-_align_start)*1e-9,
             ])
             _t_end = _align_end
-            for idx, delay, freq, demod_wave in zip(segment.idx_list, segment.delays, segment.freqs,
-                                        segment.demod_wave_list):
+            for idx, delay, freq in zip(segment.idx_list, segment.delays, segment.freqs):
                 res_map[idx] = [freq_map.index(freq), cap_num]
-                phase_map[idx] = self._delay2_phase(delay + _start_diff, freq)  # 向前取整的缩进加上起始时间的差值来计算相位
+                phase_map[idx] = self._delay2_phase(delay + _start_diff, freq)
                 points_map[idx] = segment.ad_duration * 1e-9 * self.ad_srate
 
         self.res_maps[ch] = res_map
         self.capture_cali_param[ch] = np.exp(-1j * np.array(phase_map)).reshape((-1, 1))
         self.capture_points[ch] = np.array(points_map).reshape((-1, 1))
-        return program_cap(seq_param), freq_map, demod_wave_map
+        return program_cap(seq_param), freq_map
 
     def out_sequence_in_time(self, wave_list: list):
         last_start = wave_list[0][0]
@@ -430,7 +349,7 @@ class Driver(BaseDriver):
         for (freq_num, cap_num) in self.res_maps[ch]:
             res.append(iq_res[freq_num][cap_num::len(self.capture_cmds[ch])])
         # 采样点归一化
-        res = np.array(res) / self.demode_calculus[ch]
+        res = np.array(res) / self.capture_points[ch]
         # 校准相位
         res *= self.capture_cali_param[ch]
 
@@ -457,13 +376,9 @@ class Driver(BaseDriver):
         if name in {'Coefficient'}:
             coef_info = value
             self.chs.add(channel)
-            kernel, freq_map, demod_wave_map = self.generate_in_program(coef_info, channel)
+            kernel, freq_map = self.generate_in_program(coef_info, channel)
             self.handle.set("ProgramIN", kernel, channel)
-            demode_wave = get_demod_envelope(coef_info, demod_wave_map, sampleRate=8e9)
-            self.demode_calculus[channel] = np.sum(demode_wave)
-            self.handle.set("DemodulationParam", demode_wave, channel)
             self.handle.set('TimeWidth', 2e-6, channel)
-
             self.handle.set("FreqList", freq_map, channel)
             self.coef_cache.update({channel: coef_info})
         elif name in {

nsqdriver/NS_MCI.py

@@ -201,6 +201,12 @@ class Driver(BaseDriver):
             print(f'Driver: {self.addr}不在位，请检查网络重新open')
             self.device_online = False
             return
+
+        tran = Transport(use_builtin_types=True)
+        tran.accept_gzip_encoding = False
+        self.handle = xmlrpc.client.ServerProxy(f'http://{self.addr}:10801', transport=tran, allow_none=True,
+                                                use_builtin_types=True)
+        self.fast_rpc = FastRPC(self.addr, self.timeout)
         # 此时会连接rfsoc的指令接收tcp server
         result = True
         result &= self.handle.start_command(self.timeout)
@@ -212,9 +218,7 @@ class Driver(BaseDriver):
         values.update(system_parameter)
         for name, value in values.items():
             if value is not None:
-                res = self.fast_rpc.rpc_set(name, value, 0, False)
-                if isinstance(res, str):
-                    print("*********后台提示*********\n", res)
+                self.fast_rpc.rpc_set(name, value, 0, False)
         print_debug('Driver: 后端参数配置成功')
 
         # 系统开启前必须进行过一次初始化
@@ -273,9 +277,9 @@ class Driver(BaseDriver):
                 value = {}
             self.init_device(system_parameter=value)
             return
-        if name in {'ProgramSrc', 'ProgramOUTSrc', 'ProgramINSrc'}:
-            source = [value.top_src, value.func_args, value.func_kwargs]
-            value = source
+        elif name == 'Timeout':
+            self.timeout = value
+
         value = RPCValueParser.dump(value)
         func = self.fast_rpc.rpc_set
         name = 'GenWave' if name == 'Waveform' and value[0] == RPCValueParser.dump_tag_waveform else name
@@ -554,10 +558,12 @@ class RPCValueParser:
             value = [RPCValueParser.load(_v) for _v in value]
         return value
 
+
 class InfoSharedList:
     memory_name = 'NS_DEVICE_MEMORY'
     memory_size = 1024 ** 2
     head_size = 32  # memory中前head_size的长度为头部预留信息
+
     def __init__(self):
         try:
             self._memory = shared_memory.SharedMemory(name=self.memory_name, create=True, size=self.memory_size)

nsqdriver/NS_QSYNC.py

@@ -266,9 +266,6 @@ class Driver(BaseDriver):
                 return
             data = self.__fmt_qsync_mask(*value)
             self._send_command(data)
-        elif name == 'GT_pd':
-            data = self._fmt_gt_pd(value)
-            self._send_command(data)
 
         elif name == "GeneratePrtTrig":
             data = self.__fmt_qsync_prt(self.subprtparam)
@@ -276,35 +273,6 @@ class Driver(BaseDriver):
         else:
             self.param[name] = value
 
-    @lru_cache(maxsize=32)
-    def _fmt_gt_pd(self, value):
-
-        head = 0x61000003
-        if value == 1:
-            cmd_pack = (
-                0x5F5F5F5F,
-                head,
-                0x00000000,
-                32,
-                0xCFF3FFFF,
-                0xFFFFFFFF,
-                0xCFF3FFFF,
-                0xFFFFFFFF
-            )
-        else:
-            cmd_pack = (
-                0x5F5F5F5F,
-                head,
-                0x00000000,
-                32,
-                0xFFFFFFFF,
-                0xFFFFFFFF,
-                0xFFFFFFFF,
-                0xFFFFFFFF
-            )
-
-        return struct.pack('=' + 'I' * len(cmd_pack), *cmd_pack)
-
     def subprt(self, name, value, ch=1):
         """
         subprt参数过滤
@@ -640,8 +608,7 @@ class DeviceCmdHandle:
     error_map = {b'\x1a\x00\x001': {1: '指令Resync执行失败',
                                     2: 'REFCLK not Detected',
                                     3: 'Clock Maybe unstable, DAC Settings Error',
-                                    4: 'Clock Maybe unstable, ADC Settings Error, '
-                                       'Please check if the amplifier is too large',
+                                    4: 'Clock Maybe unstable, ADC Settings Error',
                                     5: 'SYSREF(External TRIG) not Detected, MTS failed / Sample Rate not Support',
                                     7: 'ADC Calibration Failed'}
                  }
@@ -655,7 +622,7 @@ class DeviceCmdHandle:
         errors = []
         for board, future in zip(boards, futures):
             if board.has_cmd_link and board.has_stream_link:
-                _id = (board.sig_fpga_pci_port & 0xFF) << 24
+                _id = (board.ds_id & 0xFF) << 24
                 _res = struct.unpack('IIIII', future.result())[-1] & 0xFFFFFF
                 if _res:
                     errors.append(f'指令{cmd_data[4:8].tobytes()}向{board.cs_target}转发失败\n')

nsqdriver/__init__.py

@@ -1,10 +1,10 @@
 from .NS_MCI import Driver as MCIDriver
 from .NS_QSYNC import Driver as QSYNCDriver
 from .NS_CST import Driver as CSTDriver
-# from .compiler.ns_wave import InsChannel
-# from .compiler.py_wave_asm import nsw_config, AssemblyError
+from .compiler.ns_wave import InsChannel
+from .compiler.py_wave_asm import nsw_config, AssemblyError
 
-version_pack = (0, 0, 241)
+version_pack = (0, 0, 300)
 
-__version__ = '.'.join(str(_) for _ in version_pack)
-__all__ = ['MCIDriver', 'QSYNCDriver', 'CSTDriver']
+__version__ = ".".join(str(_) for _ in version_pack)
+__all__ = ["MCIDriver", "QSYNCDriver", "CSTDriver", "InsChannel"]

nsqdriver/nswave/__init__.py

@@ -6,4 +6,4 @@ import nsqdriver.nswave._checkers as checkers
 import nsqdriver.nswave._translate as translator
 
 
-__all__ = ['Kernel', 'ir_pass', 'rules', 'checkers', 'translator', 'form_kernel']
+__all__ = ['Kernel', 'ir_pass', 'rules', 'checkers', 'translator']

{nsqdriver-0.0.241.dist-info → nsqdriver-0.0.300.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nsqdriver
-Version: 0.0.241
+Version: 0.0.300
 Summary: Q series measurement and control equipment driver interface
 Home-page: https://g2hoyqcmh4.feishu.cn/wiki/Jgt1wxlKniveYQkqCgbcJHsMnoe
 Classifier: Intended Audience :: Developers

nsqdriver-0.0.300.dist-info/RECORD

@@ -0,0 +1,41 @@
+nsqdriver/NS_CST.py,sha256=zA5YcM65v66EqwBnplDvA6HM0I-y8damDOerE2CKyZE,8137
+nsqdriver/NS_DDS_NEW.py,sha256=9c-9PlnyAA811EJ67vgFSZrWz0vvvBoi6-R9VCYoyco,22924
+nsqdriver/NS_DDS_v3.py,sha256=sawKNLeSEmLKkKfPe-O9-LZCAY1lyTPEN3YJiAYU2Lc,20784
+nsqdriver/NS_MCI.py,sha256=9c-9PlnyAA811EJ67vgFSZrWz0vvvBoi6-R9VCYoyco,22924
+nsqdriver/NS_QSYNC.py,sha256=bPD0cAUehRXpTDwMNZutB5AWhZM7iwKBD5t5jmJiBF4,27900
+nsqdriver/__init__.py,sha256=VhnMFIwkYwI3dqQ9JFE0O1a1_LZXz74epIblq1_qWdI,383
+nsqdriver/common.py,sha256=5BRActb9TgNdVwWtfuZ_gki47H1WbABzYr5XbxLKlh4,519
+nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nsqdriver/compiler/assembler.cp310-win_amd64.pyd,sha256=I--vmIqU254umrP5s3yfxt_2I3O7WUeLkn6IDCKciKw,390144
+nsqdriver/compiler/ns_wave.cp310-win_amd64.pyd,sha256=qVF1Dq7cPl8vWQWRY18YAExy8Ql-ef9bsaUm0JfBxdM,209408
+nsqdriver/compiler/ns_wave.pyi,sha256=axQaxrMaKRPx8k9sDVlRj3SjR03AmXUDzkVW4D_2RJw,3975
+nsqdriver/compiler/py_wave_asm.cp310-win_amd64.pyd,sha256=foLSFJa5scxtLDfgViz1Y53qEs-9a_4sV1-FZ7kdzTw,282112
+nsqdriver/compiler/py_wave_asm.pyi,sha256=PqEZuNt83CCu_FJUczUjStowOz2TBgvfIytGanFPHuQ,685
+nsqdriver/nswave/__init__.py,sha256=rAU1XD58JBF7iAYB5LVD-ZlEmQq9wyJrsRVHF-OOrzI,302
+nsqdriver/nswave/_asm.pyi,sha256=f8IjCLPIocBZXTC8F5GFTlI6ZDa5-hhShJPjL166K4o,2846
+nsqdriver/nswave/_checkers.cp310-win_amd64.pyd,sha256=jhNqeBnJIFbjwWLvP7SFpq7YQS2EJcImIXzLr1iM5gc,181248
+nsqdriver/nswave/_checkers.pyi,sha256=931KCK3B87dE0qjtWcEt6C-_KSIdH0RRiIYer8p6Tgg,1459
+nsqdriver/nswave/_errors.cp310-win_amd64.pyd,sha256=Wtvbo93ADNdQ7lL44IQJ0TYNowJBxGWdSlKtExg5jTo,72192
+nsqdriver/nswave/_errors.pyi,sha256=A4LLc1zu6blJgmaAW_Wdx19jvFe1fkIggkTgYaQ8BIM,664
+nsqdriver/nswave/_functions.cp310-win_amd64.pyd,sha256=TNHRe9V4EC_GtOlWp6XIuGRWP6CvxYKJHz1_dBY8VLM,206336
+nsqdriver/nswave/_functions.pyi,sha256=wOzfZITAzupxAONxGELNF_U-XMy1CTdr8iU8UeszTQk,1992
+nsqdriver/nswave/_ir.cp310-win_amd64.pyd,sha256=aVG8TJrkvZDyLv-diW-2w2065zWF-gD22_GHHRK9FxM,496128
+nsqdriver/nswave/_ir.pyi,sha256=nPh7se2s1D80zMLF_bSrA4WpKI7uk-hrLRPs5JHadxc,7413
+nsqdriver/nswave/_ir_pass.cp310-win_amd64.pyd,sha256=En9RbqCPhqvT3e5qILunLvHMQRXc1aiandEsgw1E6Ns,52736
+nsqdriver/nswave/_ir_pass.pyi,sha256=UmQVLgcfX1rw9HuMorRCensJtxB4b7zh7uyIIlTF_A0,289
+nsqdriver/nswave/_optimizations.cp310-win_amd64.pyd,sha256=vwxPPAaipzBV43fJ64DhY2B6CyoSaNcQdgEi7Creq5w,72192
+nsqdriver/nswave/_optimizations.pyi,sha256=6WxLlO1aJEMMGB4qL3iSr0l43b6pSH-7qRSHXzCQQa8,508
+nsqdriver/nswave/_rules.cp310-win_amd64.pyd,sha256=qFRx5cBx8L0YoL_s325EGOwECbceAgru0ESW_5GNJpo,192000
+nsqdriver/nswave/_rules.pyi,sha256=bMynUPRkrIfTNXPt0K7Rqy5cp4B-4EIdolznVBJaaAM,1926
+nsqdriver/nswave/_simulator.cp310-win_amd64.pyd,sha256=W4x42bo9g00GrLeEUs-WAEA29ib_sRFGOVDINywVUdA,148480
+nsqdriver/nswave/_translate.cp310-win_amd64.pyd,sha256=jzASAO0SEYdwLIIP9--_fGxoK-8d-zmo0H9egKe0DzY,110592
+nsqdriver/nswave/_translate.pyi,sha256=f0N24eSL7hKj2R04W-EFeEo9A8UYfzHOta7LQrDn-UA,387
+nsqdriver/nswave/kernel.cp310-win_amd64.pyd,sha256=dWNCrZQvSLJ0KbkBZZcBNNSQi8mW6h3s6rbbxTMDpZc,321024
+nsqdriver/nswave/kernel.pyi,sha256=GBjjcfGBFiZ7_PCSgOWJcfVqckYg_r3j7PsMpUeaozE,2009
+nsqdriver/wrapper/AWG_ADC.py,sha256=wLtkbJe39hDcnbWZ-8jyGZ78RQtn7iAZ7P7H0n-2IWU,19733
+nsqdriver/wrapper/ND_NSMCI.py,sha256=e0j7BUdfrhfYb1GqBPlO4vSoZPXTKyictXy1nPvoMFE,6533
+nsqdriver/wrapper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nsqdriver-0.0.300.dist-info/METADATA,sha256=0YYSTwA3caC12dhGBo_UwVUfs2tDOAXvy_i70gRHF94,4576
+nsqdriver-0.0.300.dist-info/WHEEL,sha256=KUuBC6lxAbHCKilKua8R9W_TM71_-9Sg5uEP3uDWcoU,101
+nsqdriver-0.0.300.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
+nsqdriver-0.0.300.dist-info/RECORD,,