QUBIT-Driver 1.2.0__tar.gz → 1.2.2__tar.gz

{qubit_driver-1.2.0 → qubit_driver-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QUBIT_Driver
-Version: 1.2.0
+Version: 1.2.2
 Summary: Drive adapted for the quantum control system of the CeYear 1U Qubit_Driver Institute
 Home-page: 
 Author: He Guo Yang
@@ -41,5 +41,9 @@ $ pip install QUBIT_Driver
 
 ### License
 ## Update log
-'1.2.0' first release
+### 1.2.2
+- 修改设备名称与驱动文件名称
+### 1.2.1
+- 新增耦合波形发生器驱动功能CY_8DA.py文件
+###'1.2.0' first release
 [MIT]

qubit_driver-1.2.0/QUBIT_Driver/CY_10DA.py → qubit_driver-1.2.2/QUBIT_Driver/CY_10ReadJili.py

@@ -3,12 +3,12 @@ import socket
 import time
 
 class CYDA10Driver:
-    support_models = ['CY_10DA']
+    support_models = ['CY_10ReadJili']
 
 
     def __init__(self, addr, **kw):
         self.addr = addr
-        self.model = 'CY_10DA'
+        self.model = 'CY_10ReadJili'
         self.srate = 10e9
         
     def open(self):

qubit_driver-1.2.0/QUBIT_Driver/CY_6DA.py → qubit_driver-1.2.2/QUBIT_Driver/CY_6XY.py

@@ -9,7 +9,7 @@ class CYDA6Driver:
 
     def __init__(self, addr, **kw):
         self.addr = addr
-        self.model = 'CY_6DA'
+        self.model = 'CY_6XY'
         self.srate = 6e9
 
     def open(self):

qubit_driver-1.2.0/QUBIT_Driver/CY_6DADC.py → qubit_driver-1.2.2/QUBIT_Driver/CY_6Z.py

@@ -3,12 +3,12 @@ import socket
 import time
 
 class CYDADCDriver:
-    support_models = ['CY_6DADC']
+    support_models = ['CY_6Z']
 
     
     def __init__(self, addr, **kw):
         self.addr = addr
-        self.model = 'CY_6DADC'
+        self.model = 'CY_6Z'
         self.srate = 6e9
 
     def open(self):

qubit_driver-1.2.2/QUBIT_Driver/CY_8Couple.py

@@ -0,0 +1,211 @@
+import numpy as np
+import socket
+import time
+
+
+class CYDA8Driver:
+    support_models = ['CY_8Couple']
+
+
+    def __init__(self, addr, **kw):
+        self.addr = addr
+        self.model = 'CY_8Couple'
+        self.srate = 6e9
+
+    def open(self):
+        #建立连接
+        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.sock.connect((self.addr, 4196))
+        # self.sock.setsockopt(socket.IPPROTO_TCP,socket.TCP_NODELAY,1)
+        self.sock.settimeout(10)
+        #复位
+        self.sock_query('*RST')
+
+        #设置奈奎斯特区间为2区
+        self.set(':AWG:NYZONE',2)
+        #幅度校准加载
+        self.set(':AWG:WORK:VOLT?')
+
+        self.CAWEn = 0 # 0: 任意波, 1: 载波
+        self.CycleSeq = 1 # 1: 单次播放, 0: 循环播放
+
+
+    def close(self, **kw):
+        self.sock.close()
+
+    def write(self, name: str, value, **kw):
+        ch = kw.get('ch', 9)
+
+        if name in ['TriggerDelayAWG',]:
+            self.rd_Delay(ch, value)
+        elif name in ['rdAtt',]:
+            self.rd_Att(ch, value)  
+        elif name in ['Waveform']:
+            self.download_AWG_waveData(value,ch)
+        elif name in ['CAWWave',]:
+            self.Generate_Caw_Wave(value,ch)
+        elif name in ['Nyzone']:
+            self.set('::AWG:NYZONE',value)
+        elif name in ['FeedBack']:
+            self.set(':AWG:FEEDB', value) # 1 开启 0 关闭
+        elif name in ['CAWEn']:
+            """ 1: 载波 
+                0: 任意波
+            """
+            assert value in [0, 1], f'CAWEn can only be 0 or 1!'
+            self.CAWEn = value
+        elif name in ['CycleSeq']:
+            """ 1: 单次播放
+                0: 循环播放
+            """
+            assert value in [0, 1], f'CycleSeq can only be 0 or 1!'
+            self.CycleSeq = value
+        else:
+            pass
+
+
+    # *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*# user defined #*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#
+
+    def set(self, cmd_name, params = None):
+            """
+            发送带参数的程控指令
+            :param sock: 已连接的socket对象
+            :param cmd_name: 指令名称（如"SET_FREQ"）
+            :param params: 可变参数（如频率值、通道号等）
+            """
+
+            # 1. 拼接指令字符串（例如："SET_FREQ,100000 1;" 表示设置通道1的频率为100000Hz）
+            if params != None:
+                # param_str = ",".join(map(str, params))  # 将参数转换为字符串并拼接
+                param_str = str(params)
+                cmd_str = f"{cmd_name} {param_str}\n"    # 组合成完整指令（带结束符）
+            else:
+                cmd_str = f"{cmd_name}\n"    # 组合成完整指令（带结束符）
+            # 2. 转换为字节流（socket传输必须是bytes类型）
+            cmd_bytes = cmd_str.encode('utf-8')
+            # 3. 发送指令
+            self.sock.sendall(cmd_bytes)
+            # print(f"已发送指令：{cmd_str}")
+
+    def sock_read(self,buffer_size=1024):
+        response = b''
+        while True:
+            chunk = self.sock.recv(buffer_size)
+            if not chunk:
+                break  # 连接关闭
+            response += chunk
+            if b'\n' in chunk:
+                break  # 达到结束标志
+        return response.strip()
+        
+    def sock_query(self, cmd_name,params = None):
+        self.set( cmd_name, params)
+        return self.sock_read()
+
+    
+    ##########################################################################################################
+    def ChlSel(self,chl,name = ':AWG:CHLSel'):
+        chl = chl -1
+        self.set(name,chl)
+
+    def rd_Delay(self, chl, delay_ns):
+        self.ChlSel(chl)
+        self.set(':READ:DELay',delay_ns)
+        return
+    def rd_Att(self, chl, att):
+        self.ChlSel( chl)
+        self.set(':READ:ATT',att)
+        return
+    def Generate_Caw_Wave(self,value,ch):
+        self.ChlSel(ch)
+        self.set(':CAW:FREQ',value[0])
+        self.set(':CAW:PHAS',value[1])
+        self.set(':CAW:ONLY',1)
+    #############确定波形数据长度位宽#########################
+    def digit_count(num):
+        len = 0
+        if num == 0:
+            return 1
+        else:
+            while(num != 0):
+                num = num // 10
+                len = len + 1
+            return len      
+    #########################下发任意波数据#################################################
+    # ------------------------------------------------------------------------
+    # 功能说明: 【载波】 *用于任意波形数据下发
+    #       输入参数:波形数据
+    #
+    # 返回值: 无
+    # ------------------------------------------------------------------------
+    def AWG_Data_Download(self,waveData):
+        # self.ChlSel(ch)
+        #下发波形数据
+        len_once = 134000000
+        m_Len_bytes = len(waveData)%len_once
+        m_Len_count = len(waveData)//len_once
+        if m_Len_count != 0:
+            for k in range(m_Len_count):
+                dataSend = b':AWG:WRITe #9134000000'+waveData[134000000*k:134000000*(k+1)]
+                self.sock.sendall(dataSend)
+                self.sock_read()
+        if m_Len_bytes != 0:
+            digit_len = self.digit_count(m_Len_bytes)
+            dataSend = b':AWG:WRITe #'+str(digit_len).encode('utf-8')+\
+                       str(m_Len_bytes).encode('utf-8')+\
+                       waveData[m_Len_count*134000000:m_Len_count*134000000+m_Len_bytes]
+            self.sock.sendall(dataSend)
+            self.sock_read()
+        return
+    # ------------------------------------------------------------------------
+    # 功能说明: 量化float数据 并转bytes 【用于转换任意波形数据】
+    # 输入参数:
+    #       data:【数据类型: ndarray或list】 
+    #            【取值范围: 0~1】
+    #            【参数意义: 待处理的float数据数组或列表】
+    # 输出参数:
+    #       data_bytes:【数据类型: bytes】
+    #                  【数据说明: 每16位为一组, 范围: 0~0xFFFF, 低14位有效】
+    #                  【参数意义: 转换后的生成的bytes数据】
+    # 返回值: data_bytes
+    # ------------------------------------------------------------------------
+    def float2bytes(self,data):
+        # 如果为list格式，则转为array进行处理
+        if isinstance(data,list):
+            data = np.array(data).reshape(1,-1)
+        else:
+            # 转换为1维数组
+            data = data.reshape(1,-1)
+
+        len_data = np.size(data)
+        # 是否为偶数个元素，如果不是，补1个0
+        if len_data % 2 != 0:
+            np.append(data,0)
+            len_data = len_data +1
+        # -------- 元素两个一组，每组前后对调 -----------------    
+        data_uint16 = np.uint16(data*(pow(2,15)-1))
+        #####################
+        # data_uint16 = np.bitwise_or(data_uint16,1)
+        ##################
+        data_bytes = data_uint16.tobytes()
+        return data_bytes
+    
+
+    def download_AWG_waveData(self,data,ch=9):
+        data_bytes = self.float2bytes(np.array(data).reshape(-1,1))
+        #波形模块使能复位
+        self.ChlSel(ch)
+        self.set(':AWG:BDOWnlclear')
+        #波形下发与控制
+        self.AWG_Data_Download(data_bytes)
+        #设置任意波模式
+        self.set(':CAW:ONLY', self.CAWEn)
+        #设置为单次博放
+        self.set(':AWG:SEQNUM', self.CycleSeq)
+        #通道输出打开
+        self.ChlSel(ch)
+        self.set(':AWG:SWITCH','ON')
+        # #外触发
+        # self.set(':TRIG:TYPE',0)
+        # #触发模式：波形触发模式
+        # self.set(':TRIG:CTRL',2)

qubit_driver-1.2.2/QUBIT_Driver/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.2.2"

{qubit_driver-1.2.0 → qubit_driver-1.2.2}/QUBIT_Driver.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QUBIT_Driver
-Version: 1.2.0
+Version: 1.2.2
 Summary: Drive adapted for the quantum control system of the CeYear 1U Qubit_Driver Institute
 Home-page: 
 Author: He Guo Yang
@@ -41,5 +41,9 @@ $ pip install QUBIT_Driver
 
 ### License
 ## Update log
-'1.2.0' first release
+### 1.2.2
+- 修改设备名称与驱动文件名称
+### 1.2.1
+- 新增耦合波形发生器驱动功能CY_8DA.py文件
+###'1.2.0' first release
 [MIT]

{qubit_driver-1.2.0 → qubit_driver-1.2.2}/QUBIT_Driver.egg-info/SOURCES.txt

@@ -1,9 +1,10 @@
 LICENSE
 README.md
 setup.py
-QUBIT_Driver/CY_10DA.py
-QUBIT_Driver/CY_6DA.py
-QUBIT_Driver/CY_6DADC.py
+QUBIT_Driver/CY_10ReadJili.py
+QUBIT_Driver/CY_6XY.py
+QUBIT_Driver/CY_6Z.py
+QUBIT_Driver/CY_8Couple.py
 QUBIT_Driver/CY_AD.py
 QUBIT_Driver/CY_SYNC.py
 QUBIT_Driver/__init__.py

{qubit_driver-1.2.0 → qubit_driver-1.2.2}/README.md

@@ -15,5 +15,9 @@ $ pip install QUBIT_Driver
 
 ### License
 ## Update log
-'1.2.0' first release
+### 1.2.2
+- 修改设备名称与驱动文件名称
+### 1.2.1
+- 新增耦合波形发生器驱动功能CY_8DA.py文件
+###'1.2.0' first release
 [MIT]

{qubit_driver-1.2.0 → qubit_driver-1.2.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r",encoding="utf-8") as fh:
 
 setuptools.setup(
     name="QUBIT_Driver",
-    version="1.2.0",
+    version="1.2.2",
     author="He Guo Yang",
     author_email="2060817247@qq.com",
     description="Drive adapted for the quantum control system of the CeYear 1U Qubit_Driver Institute",

qubit_driver-1.2.0/QUBIT_Driver/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.1.0"