nsqdriver 0.0.203__cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl → 0.12.11__cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl

nsqdriver/NS_DDS_v3.py

@@ -1,9 +1,7 @@
 import copy
 from enum import Enum
-from math import ceil
 from collections import namedtuple
-from waveforms import Waveform, wave_eval, WaveVStack
-from waveforms.waveform import _zero
+from waveforms import Waveform, wave_eval
 from waveforms.math.signal import getFTMatrix, shift
 import nsqdriver.nswave as nw
 
@@ -89,27 +87,14 @@ def program_cap(param: nw.Var):
     nw.wait_for_trigger()
     i: nw.Var
     # param: [[100e-9, 1e-6], [200e-9, 1e-6]]
-    # nw.wait(150e-9)
     for i in param:
         nw.wait(i[0])
-        nw.capture(i[1], 0, 0)
-
-
-@nw.kernel
-def program_da(p: nw.Var):
-    i: nw.Var
-    e: nw.Var
-    nw.init_frame(0, 0)
-    nw.wait_for_trigger()
-    # nw.reset_frame()
-    for i in p:
-        nw.wait(i[0])
-        e = nw.ins_envelope(i[1])
-        nw.play_wave(e, 1, 0, 0)
+        nw.capture(i[1], i[2], i[3])
 
 
 ProbeSegment = namedtuple('ProbeSegment', ['start', 'stop', 'freq'])
 
+
 CaptureCmd = namedtuple('CaptureCmd', [
     'start', 'ad_duration', 'delay', 'da_duration', 'freqs', 'delays'
 ])
@@ -176,7 +161,8 @@ class Driver(BaseDriver):
         # barthann、cosine、exponential、tukey、taylor
 
         # 内触发
-        Quantity('GenerateTrig', value=1e7, unit='ns'),  # set/get,触发周期单位ns，触发数量=shot
+        Quantity('GenerateTrig', value=1e7,
+                 unit='ns'),  # set/get,触发周期单位ns，触发数量=shot
         Quantity('UpdateFirmware', value='', ch=1),  # qsync固件更新
         Quantity('PipInstall')  # pip install in instance
     ]
@@ -194,8 +180,7 @@ class Driver(BaseDriver):
         self.coef_cache = {}
         self.res_maps = {}
         self.probe_da_wave = {}
-        # self.probe_delay = 32e-9
-        self.probe_delay = 0e-9
+        self.probe_delay = 32e-9
         self.capture_cmds: "dict[int, list[CaptureCmd]]" = {}
         self.capture_cali_param: "dict[int, np.ndarray]" = {}
         self.capture_points: "dict[int, np.ndarray]" = {}
@@ -226,24 +211,18 @@ class Driver(BaseDriver):
 
     def granularity4ns(self, delay):
         points_4ns = 16  # self.ad_srate*4e-6
-        return delay * self.ad_srate // points_4ns * points_4ns / self.ad_srate
-
-    def granularity4ns_zero_num(self, delay):
-        points_4ns = 16
-        out_delay = delay * self.srate // points_4ns * points_4ns / self.srate
-        zero_num = round((delay - out_delay) * self.srate)
-        return out_delay, zero_num
+        return delay*self.ad_srate//points_4ns*points_4ns/self.ad_srate
 
     @staticmethod
     def _delay2_phase(delay, freq):
-        return 2 * np.pi * freq * delay
+        return 2*np.pi*freq*delay
 
-    def in_sequence_in_time(self, coef_info: dict) -> list[CaptureCmd]:
+    def get_sequence_in_time(self, coef_info: dict) -> list[CaptureCmd]:
         w_list = coef_info.get('wList', [])
         time_segments: "list[ProbeSegment]" = []
 
         for wave in w_list:
-            t0 = round(wave['t0']*1e9)/1e9
+            t0 = wave['t0']
             weight_expr = wave['weight']
 
             # 假设 weight 表达式格式为 "square(X) >> Y"，我们提取实际时间宽度
@@ -251,7 +230,7 @@ class Driver(BaseDriver):
             _start, _stop, _ = wave_eval(weight_expr).bounds
 
             # 将区间加入列表
-            seg = ProbeSegment(t0 + _start, t0 + _stop, wave['Delta'])
+            seg = ProbeSegment(t0+_start, t0+_stop, wave['Delta'])
             time_segments.append(seg)
 
         # 按起始时间排序
@@ -261,7 +240,7 @@ 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.])
-        current_align_delay = current_start - self.granularity4ns(current_start)
+        current_align_delay = current_start-self.granularity4ns(current_start)
         pointer = 0
 
         for seg in time_segments[1:]:
@@ -284,7 +263,7 @@ class Driver(BaseDriver):
                 current_end = max(current_end, seg.stop)
                 current_cmd.freqs.append(seg.freq)
                 # 由delay换算解缠绕相位
-                current_cmd.delays.append(seg.start - current_start)
+                current_cmd.delays.append(seg.start-current_start)
         else:
             # 添加最后一个段
             current_cmd = current_cmd._replace(start=current_start - pointer - self.probe_delay)
@@ -294,14 +273,14 @@ class Driver(BaseDriver):
             non_overlapping_segments.append(current_cmd)
         return non_overlapping_segments
 
-    def generate_in_program(self, coef_info, ch):
+    def generate_para(self, coef_info, ch):
         res_map = []
         phase_map = []
         points_map = []
         freq_map = []
         seq_param = []
 
-        self.capture_cmds[ch] = seq = self.in_sequence_in_time(coef_info)
+        self.capture_cmds[ch] = seq = self.get_sequence_in_time(coef_info)
 
         for segment in seq:
             freq_map.extend(segment.freqs)
@@ -309,89 +288,26 @@ class Driver(BaseDriver):
 
         for cap_num, segment in enumerate(seq):
             _start = self.granularity4ns(segment.start)
-            _start_diff = segment.start - _start
+            _start_diff = segment.start-_start
             seq_param.append([
                 _start, segment.ad_duration, segment.delay, segment.da_duration
             ])
             for delay, freq in zip(segment.delays, segment.freqs):
                 res_map.append([freq_map.index(freq), cap_num])
-                phase_map.append(self._delay2_phase(delay+_start_diff, freq))
-                points_map.append(segment.ad_duration * self.ad_srate)
+                phase_map.append(self._delay2_phase(delay, freq))
+                points_map.append(segment.ad_duration*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_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
 
-    def out_sequence_in_time(self, wave_list: list):
-        last_start = wave_list[0][0]
-        last_stop = wave_list[0][1]
-        temp_w = [wave_list[0][2]]
-        _res = []
-
-        for idx, (start, stop, seg) in enumerate(wave_list[1:]):
-            if start > last_stop:
-                _res.append([last_start, last_stop, np.hstack(temp_w)])
-                last_start = start
-                last_stop = stop
-                temp_w.clear()
-                temp_w.append(seg)
-            else:
-                last_stop = max(last_stop, stop)
-                temp_w.append(seg)
-        else:
-            _res.append([last_start, last_stop, np.hstack(temp_w)])
-        return _res
-
-    def gen_wave_frag(self, x, wave: "Waveform"):
-        range_list = np.searchsorted(x, wave.bounds)
-        #ret = np.zeros_like(x)
-        ret = []
-        start, stop = 0, 0
-        for i, stop in enumerate(range_list):
-            if start < stop and wave.seq[i] != _zero:
-                _w = copy.deepcopy(wave)
-                _w.start = start/self.srate
-                _w.stop = stop/self.srate
-                part = _w.sample(self.srate)
-                ret.append((start, stop, part))
-            start = stop
-        else:
-            if not ret:
-                ret.append((0, 128, np.zeros((128, ))))
-        return ret
-
-    def generate_out_program(self, _wave, ch):
-        align_points = 32   # 4ns*8e9
-        if isinstance(_wave, WaveVStack):
-            _wave = _wave.simplify()
-        if len(_wave.seq) == 1 and _wave.seq[0] == _zero:
-            wave_list = [(0, 128, np.zeros((128, )))]
-        else:
-            _wave.stop = _wave.bounds[-2]
-            wave_list = self.gen_wave_frag(np.linspace(_wave.start, _wave.stop, int((_wave.stop-_wave.start) * self.srate)+1), _wave)
-            # wave_list = self.gen_wave_frag(np.arange(_wave.start, _wave.stop, 1/self.srate), _wave)
-        print(f'generate_out_program: {_wave.start=}, {_wave.stop=}, {wave_list=}, {ch=}')
-        _t_end = 0
-        para = []
-        wave = self.out_sequence_in_time(wave_list)
-
-        for i in wave:
-            wait = (i[0] - _t_end)
-            align_wait = wait // align_points * align_points
-            zero_num = wait - align_wait
-            align_end = ceil(i[1]/align_points)*align_points
-            align_wave = [np.zeros(zero_num), i[2], np.zeros([align_end - i[1]])]
-            para.append([align_wait/self.srate, np.hstack(align_wave)])
-            _t_end = align_end
-        return program_da(para)
-
     def get_coef_res(self, iq_res, ch):
         res = []
         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.capture_points[ch]
+        res = np.array(res)/self.capture_points[ch]
         # 校准相位
         res *= self.capture_cali_param[ch]
 
@@ -414,25 +330,22 @@ class Driver(BaseDriver):
 
     def write(self, name: str, value, **kw):
         channel = kw.get('ch', 1)
-        # print(f'NS_DDS_v3 write: {name=}, {channel=}')
         if name in {'Coefficient'}:
+            # data, f_list, numberOfPoints, phases, points, _ = get_coef(value, 4e9)
             coef_info = value
             self.chs.add(channel)
-            kernel, freq_map = self.generate_in_program(coef_info, channel)
-            self.handle.set("ProgramIN", kernel, channel)
+            kernel, freq_map = self.generate_para(coef_info, channel)
+            self.handle.set("Program", kernel, channel)
             self.handle.set("FreqList", freq_map, channel)
             self.handle.set("TimeWidth", 2e-6, channel)
             self.coef_cache.update({channel: coef_info})
+        # elif name in {'Waveform'} and isinstance(value, waveforms.Waveform):
+        #     self.probe_da_wave[channel] = value
         elif name in {
             'CaptureMode', 'SystemSync', 'ResetTrig', 'TrigPeriod',
             'TrigFrom'
         }:
             pass
-        elif name in {
-            'GenWave', 'Waveform'
-        } and isinstance(value, Waveform):
-            kernel_da = self.generate_out_program(value, channel)
-            self.handle.set("ProgramOUT", kernel_da, channel)
         else:
             if name in {"Shot"}:
                 self.shots = value
@@ -457,7 +370,7 @@ class Driver(BaseDriver):
 
 
 if __name__ == '__main__':
-    co = {'start': 0.0, 'stop': 10e-06, 'wList': [
+    co = {'start': 0.0, 'stop': 8.605e-06, 'wList': [
         {'Delta': 6796613333.333333, 'phase': -0.0, 'weight': 'square(8e-07) >> 4e-07', 'window': (0, 1024), 'w': None,
          't0': 1.5e-08, 'phi': 2.4311851282940524, 'threshold': 9.645718574523926},
         {'Delta': 6965129999.666667, 'phase': -0.0, 'weight': 'square(8e-07) >> 4e-07', 'window': (0, 1024), 'w': None,
@@ -477,72 +390,5 @@ if __name__ == '__main__':
         {'Delta': 6965129999.666667, 'phase': -0.0, 'weight': 'square(8e-07) >> 4e-07', 'window': (0, 1024), 'w': None,
          't0': 9.005e-06, 'phi': 2.4311851282940524, 'threshold': 9.645718574523926}
     ]}
-    import matplotlib.pyplot as plt
-    from nsqdriver import QSYNCDriver
-    import time
-    import waveforms as wf
-    from nsqdriver.NS_MCI import SHARED_DEVICE_MEM
-
-    SHARED_DEVICE_MEM.clear_ip()
-    _d = Driver('192.168.0.43', 300)
-    qsync = QSYNCDriver("192.168.0.43")
-    _d = Driver('192.168.0.228', 30)
-    _q = QSYNCDriver('192.168.0.228')
-    time.sleep(5)
-    _wave = wf.zero()
-    for _w in co['wList']:
-        t0 = _w['t0']
-        _wave += (wf.wave_eval(_w['weight']) * wf.cos(2 * np.pi * _w['Delta'])) >> t0
-    # _wave = _wave << 50e-9
-    _wave.start = 0
-    _wave.stop = 60e-6
-
-    _wave(np.linspace(0, 20e-6, int(20e-6 * 8e9)), frag=True)
-
-    wave = _wave.sample(8e9) / 3
-    _wave
-
-    for ch in range(3, 4):
-        _d.write('GenWave', _wave, ch=ch)
-        _d.write('Coefficient', co, ch=ch)
-    # res = _d.generate_para(co, 1)
-    _d.write("Coefficient", co, ch=2)
-    ch = 2
-    # wave = wf.cos(2*wf.pi*0.15e9)
-    # wave.start = 0
-    # wave.stop = 1e-6
-
-    _wave = waveforms.zero()
-    for _w in co['wList']:
-        t0 = _w['t0']
-        _wave += (waveforms.wave_eval(_w['weight']) * waveforms.cos(2 * np.pi * _w['Delta'])) >> t0
-    # _wave = _wave << 50e-9
-    _wave.start = 0
-    _wave.stop = co["stop"]
-    plt.plot(_wave.sample(8e9))
-    plt.show()
-    _d.write("GenWave", _wave, ch=2)
-    _d.set('CaptureMode', 1)
-    shots = 1024
-    qsync.set('Shot', shots)
-    _d.write('Shot', shots)
-    _d.set('StartCapture')
-    qsync.set('GenerateTrig', 400e-6)
-    time.sleep(400e-6 * shots + 0.5)
-    data = _d.get('TraceIQ', ch)
-    data = np.array(data)
-    print(data.shape)
-    data = data.reshape((shots, -1))
-    # qsync.set("Shot", 0xFFFFFFFF)
-    # qsync.set("GenerateTrig", 500e-6)
-    plt.figure()
-    plt.plot(data.mean(axis=0)[:])
-    plt.show()
-    _d.set('CaptureMode', 0)
-    _d.write("Coefficient", co, ch=2)
-    _d.write("GenWave", _wave, ch=2)
-    _d.set('StartCapture')
-    qsync.set('GenerateTrig', 40e-6)
-    data = _d.read("IQ", ch=2)
-    print(20 * np.log10(np.abs(data.mean(axis=0))))
-    pass
+    _d = Driver('127.0.0.1', 300)
+    res = _d.generate_para(co, 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, 0, 203)
+version_pack = (0, 12, 11)
 
 __version__ = '.'.join(str(_) for _ in version_pack)
 __all__ = ['MCIDriver', 'QSYNCDriver', 'CSTDriver', 'InsChannel']

{nsqdriver-0.0.203.dist-info → nsqdriver-0.12.11.dist-info}/METADATA

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

{nsqdriver-0.0.203.dist-info → nsqdriver-0.12.11.dist-info}/RECORD

@@ -1,16 +1,16 @@
-nsqdriver/NS_DDS_v3.py,sha256=ypPG_7E7wSlLwJWi1x8M_PveJDv8lge7y7CFL9Yf058,21794
+nsqdriver/NS_DDS_v3.py,sha256=dl78gjy0Ws41QSfi5kRk8tRZI9yMFxbjiX2K1Topotw,16564
 nsqdriver/NS_CST.py,sha256=_QYCjg1YglIJ4YVmxvISqvy5rExWGlMhyrK9zYIRbRY,7877
 nsqdriver/NS_MCI.py,sha256=cLvnEtqVnzlrKSbcVzXJOG72K4_RSGLGNjxW5KmPtMI,21903
 nsqdriver/common.py,sha256=IHfShqgNN3THbe7KD7ICdfFY7JKC_kQj0_KJk-449gQ,499
-nsqdriver/__init__.py,sha256=5eARPvOu4Pe_nagSOTFqxv3a5cTy_3SLPZW5AGWMJ-s,373
+nsqdriver/__init__.py,sha256=19HDjGlgkd2RElhpltVzn7E2dFvRNesFLPVINv4UP2Q,373
 nsqdriver/NS_QSYNC.py,sha256=ZSOznM5PMlOm89rWAMiqVyZLWn3y0lTQp3d1z6LnkV0,27121
 nsqdriver/nswave/kernel.pyi,sha256=Fs-_v2XT0UpRSSoogwIbejXna6uAfceYv41PyL2m-NM,1952
 nsqdriver/nswave/_checkers.pyi,sha256=h_lMi6vWZ4SYe_5GDyOuYNbzL1nVDGvy4E-nAb9tzsk,1412
 nsqdriver/nswave/_checkers.cpython-310-aarch64-linux-gnu.so,sha256=8c4qefipItMF6rbWtQBby1eBA1cE8eDedAJgMrUCPmA,240624
 nsqdriver/nswave/_translate.cpython-310-aarch64-linux-gnu.so,sha256=E2S0rnPLJlKg0cpRQHg6ixmKg78TbgOQCgOhSvOTVHM,151096
-nsqdriver/nswave/_ir.cpython-310-aarch64-linux-gnu.so,sha256=HFBpIytxueKHJTaGgdoh8ktkUoomC3DJ1GMmhqGSAgo,471960
+nsqdriver/nswave/_ir.cpython-310-aarch64-linux-gnu.so,sha256=JxOwhCw9CZMz4Ixxz290mNLzumOkLDHpdXPtPgjpX50,438872
 nsqdriver/nswave/_ir_pass.pyi,sha256=wYOesXdZnTlZ0Ph06VVP65uc6n-k8gywEkHaaSSyPmQ,282
-nsqdriver/nswave/_functions.cpython-310-aarch64-linux-gnu.so,sha256=hSWPgdCsj5scgrFk5W8m4yCD0UNX97p9skRWPQ322yY,211040
+nsqdriver/nswave/_functions.cpython-310-aarch64-linux-gnu.so,sha256=bj2Sqt3T3VV9JeaDBzDcaPfwKdQ2dSDFFphb-0Ds2Tk,139168
 nsqdriver/nswave/_errors.pyi,sha256=pYt3VZxWgXWVNGvbQ3g6IwxItCmPcW_EfN3l1YfLk2o,640
 nsqdriver/nswave/_ir.pyi,sha256=tC4iVf0dUOevZhwbCm77pDk87PbaIbhpNGHFamNdx5k,7130
 nsqdriver/nswave/_rules.cpython-310-aarch64-linux-gnu.so,sha256=v3DkIGI8vs5rmtEHMcEkgJjxIPVtAhB1PJiSoafdHaQ,255592
@@ -23,17 +23,17 @@ nsqdriver/nswave/_asm.pyi,sha256=kayOim0cSLXwSCAAXkMu0-IsLusY95dTFORTNrHzFo8,274
 nsqdriver/nswave/_ir_pass.cpython-310-aarch64-linux-gnu.so,sha256=YLiP9yUW9acbQ5iKOgQXVcX1O_K_nEeMIiqifFIJkZk,69392
 nsqdriver/nswave/__init__.py,sha256=1-DljzsjzvnHRnD0tlpVTWSZjHtlCnP-yRirOJuG8Co,293
 nsqdriver/nswave/_optimizations.pyi,sha256=y6ytCU8SSlD4mzXe-V2GjFrvpafumK388pgxHuxDBnI,492
-nsqdriver/nswave/kernel.cpython-310-aarch64-linux-gnu.so,sha256=_uKXX3w-F_Qe3HZmhVkO1E2nB6HeZt7YcUsyPssNYek,374376
+nsqdriver/nswave/kernel.cpython-310-aarch64-linux-gnu.so,sha256=F11vcgIpz0ui80lO8cy4Wb2fImHxWRi3czU4qWxLK-A,364584
 nsqdriver/wrapper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nsqdriver/wrapper/ND_NSMCI.py,sha256=gTyrDObhbggl35V_q-kpDoPsfttIEnDFc6f0-pk_P0k,6288
 nsqdriver/wrapper/AWG_ADC.py,sha256=ktQkORc8VZUFkNg6huC7DKIkvZyHYXRolQ2SAA89JnM,19199
-nsqdriver/compiler/assembler.cpython-310-aarch64-linux-gnu.so,sha256=GM9mMOdSK66SGOGM3Uop-3lf5Wz0gPg5-jCJi1FhSlk,539752
+nsqdriver/compiler/assembler.cpython-310-aarch64-linux-gnu.so,sha256=0HhmgGGSTCWnahADdfT65vmtKOP_oWay4dpQI1MXCi8,507472
 nsqdriver/compiler/ns_wave.cpython-310-aarch64-linux-gnu.so,sha256=P3ZkQNpIsIjAR0EzDFvCoVHA52KzVmF_DmllxknbuiY,348736
 nsqdriver/compiler/py_wave_asm.cpython-310-aarch64-linux-gnu.so,sha256=1MlIGX9RxUAXCCz1GzrRoAyDvxzh2tYY8bl7vXmpvtM,482560
 nsqdriver/compiler/py_wave_asm.pyi,sha256=w2PWlBrns4tfDYjTLyOBfNgjjjVA_xzMJZYYyDPKce4,656
 nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nsqdriver/compiler/ns_wave.pyi,sha256=JQiE_9HqCzm00bS6c2JaaIXwt7xN_x9XXax-BBrE7-o,3824
-nsqdriver-0.0.203.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
-nsqdriver-0.0.203.dist-info/WHEEL,sha256=vh2oQsbkNC287YHyuh6hScUY27fsR8EWsF9NYy1tH2k,153
-nsqdriver-0.0.203.dist-info/METADATA,sha256=66YPJUo2O3fBWDhHez9698eqdmAwRPPt47Nz43Qn89c,4276
-nsqdriver-0.0.203.dist-info/RECORD,,
+nsqdriver-0.12.11.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
+nsqdriver-0.12.11.dist-info/WHEEL,sha256=vh2oQsbkNC287YHyuh6hScUY27fsR8EWsF9NYy1tH2k,153
+nsqdriver-0.12.11.dist-info/METADATA,sha256=5hsgga0-SYpUUY14UYHb9qNreofnFYqPhXrrnzjVgr8,4276
+nsqdriver-0.12.11.dist-info/RECORD,,