half-sample 0.1.3__tar.gz → 0.1.4__tar.gz

{half-sample-0.1.3 → half-sample-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: half-sample
-Version: 0.1.3
+Version: 0.1.4
 Summary: sample data and analysis
 Home-page: https://github.com/KD-Group/Half.Sample
 Author: kunde

{half-sample-0.1.3 → half-sample-0.1.4}/half_sample.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: half-sample
-Version: 0.1.3
+Version: 0.1.4
 Summary: sample data and analysis
 Home-page: https://github.com/KD-Group/Half.Sample
 Author: kunde

half-sample-0.1.4/sample/result.py

@@ -0,0 +1,120 @@
+import math
+
+
+class Result:
+    ErrorMessageMapper = {
+        # 基础状态
+        "success": "成功",
+
+        # 用户操作错误
+        "command_not_found": "命令不存在",
+        "sampler_not_found": "采样器不存在",
+        "now_in_measuring": "正在测量中",
+        "file_not_found": "文件未找到",
+
+        # 采样错误
+        "voltage_not_enough": "电压不足",
+        "wave_not_found": "未找到波形",
+        "appropriate_wave_not_found": "未找到合适波形",
+
+        # 警告类错误
+        "warning_intr_not_available": "中断资源不可用",
+        "warning_param_out_of_range": "参数超出范围",
+        "warning_prop_value_out_of_range": "属性值超出范围",
+        "warning_prop_value_not_spted": "属性值不支持",
+        "warning_prop_value_conflict": "属性值状态冲突",
+        "warning_vrg_of_group_not_same": "通道组量程不一致",
+
+        # 系统级错误
+        "error_handle_not_valid": "句柄无效",
+        "error_param_out_of_range": "参数超出范围",
+        "error_param_not_spted": "参数不支持",
+        "error_param_fmt_unexpted": "参数格式异常",
+        "error_memory_not_enough": "内存不足",
+        "error_buffer_is_null": "缓冲区为空",
+        "error_buffer_too_small": "缓冲区过小",
+        "error_data_len_exceed_limit": "数据长度超限",
+        "error_func_not_spted": "功能不支持",
+        "error_event_not_spted": "事件不支持",
+        "error_prop_not_spted": "属性不支持",
+        "error_prop_read_only": "属性只读",
+        "error_prop_value_conflict": "属性值冲突",
+        "error_prop_value_out_of_range": "属性值超限",
+        "error_prop_value_not_spted": "属性值不支持",
+        "error_privilege_not_held": "权限未持有",
+        "error_privilege_not_available": "权限不可用",
+        "error_driver_not_found": "驱动未找到",
+        "error_driver_ver_mismatch": "驱动版本不匹配",
+        "error_driver_count_exceed_limit": "驱动数量超限",
+        "error_device_not_opened": "设备未打开",
+        "error_device_not_exist": "设备不存在",
+        "error_device_unrecognized": "设备未识别",
+        "error_config_data_lost": "配置数据丢失",
+        "error_func_not_inited": "功能未初始化",
+        "error_func_busy": "功能忙",
+        "error_intr_not_available": "中断不可用",
+        "error_dma_not_available": "DMA通道不可用",
+        "error_device_io_time_out": "设备IO超时",
+        "error_signature_not_match": "签名不匹配",
+        "error_func_conflict_with_bfd_ai": "功能与缓冲AI冲突",
+        "error_vrg_not_available_in_se_mode": "单端模式量程不可用",
+        "error_undefined": "未定义错误"
+    }
+
+    def __init__(self):
+        self.error = False
+        self.message = ''
+
+        self.sampler_name = ''
+        self.measuring = False
+        self.success = False
+        self.with_magnetic = False
+
+        self.sampling_interval = 0.0  # us
+        self.wave_interval = 0.0  # us
+        self.waveforms_per_sample = 0.0  # 采集卡每次采样时能得到的最大波形数量，可能采集到部分波形，因此为double类型，例如0.5
+        self.sampling_time = 1  # 采样次数,当要求的波形数量大于采集卡单次最大采样点数的时，进行多次采样直到能采集到要求的波形
+        self.sampling_length_per_sample = 0  # 采集卡单次采样点数
+        self.waveform_length = 0  # 一个完整波形的点数(包括上升沿和下降沿)
+        self.valid_length = 0  # 有效的波形点数(仅包含上升沿部分)
+        self.number_of_waveforms = 0  # 波形平均次数
+        self.wave = []
+        self.time_line = []
+        self.estimate = []
+
+        self.tau = 0.0
+        self.tau_b = 0.0
+        self.w = 0.0
+        self.b = 0.0
+        self.loss = 0.0
+
+        self.v0 = 0.0
+        self.v_inf = 0.0
+
+        self.mock_tau = 0.0
+        self.mock_v0 = 0.0
+        self.mock_v_inf = 0.0
+        self.mock_noise = 0.0
+
+        self.rho = 0.0
+        self.miu = 0.0
+        self.carrier = 0.0
+        self.corrected_rho = 0.0
+        self.corrected_miu = 0.0
+        self.corrected_carrier = 0.0
+
+    def process(self):
+        self.time_line = [self.wave_interval * i for i in range(len(self.wave))]
+
+        if self.success:
+            tau, w, b = self.tau, self.w, self.b
+            self.estimate = [w * math.exp(t / -tau) + b for t in self.time_line]
+
+            self.v0, self.v_inf = b + w, b
+
+    @property
+    def chinese_message(self) -> str:
+        try:
+            return self.ErrorMessageMapper[self.message]
+        except Exception as e:
+            return self.message

{half-sample-0.1.3 → half-sample-0.1.4}/sample/sample.py

@@ -39,13 +39,17 @@ class Sampler:
         return p
 
     def communicate(self, command: str, executor: st.Process = None) -> Result:
-        executor = executor or self.p
-
-        executor.write_line(command)
-        lines = executor.read_until('EOF')
-
         result = Result()
-        exec(lines, result.__dict__)
+        try:
+            executor = executor or self.p
+            executor.write_line(command)
+            lines = executor.read_until('EOF')
+            if lines:
+                exec(lines, result.__dict__)
+        except Exception as e:
+            result.error = True
+            result.message = str(e)
+            raise self.Error("{}: {}".format(result.message, result.chinese_message))
 
         if result.error:
             raise self.Error("{}: {}".format(result.message, result.chinese_message))

{half-sample-0.1.3 → half-sample-0.1.4}/setup.py

@@ -2,7 +2,7 @@ import setuptools
 
 setuptools.setup(
     name="half-sample",
-    version="0.1.3",
+    version="0.1.4",
     author="kunde",
     author_email="gzkunde@163.com",
     description="sample data and analysis",

half-sample-0.1.3/sample/result.py

@@ -1,62 +0,0 @@
-import math
-
-
-class Result:
-    ErrorMessageMapper = {
-        "success": "成功",
-        "command_not_found": "命令不存在",
-        "sampler_not_found": "采样器不存在",
-        "now_in_measuring": "正在测量中",
-        "voltage_not_enough": "电压不足",
-        "real_sampler_error": "采样器出错",
-        "wave_not_found": "未找到波形",
-        "appropriate_wave_not_found": "未找到合适波形"
-    }
-
-    def __init__(self):
-        self.error = False
-        self.message = ''
-
-        self.sampler_name = ''
-        self.measuring = False
-        self.success = False
-
-        self.sampling_interval = 0.0  # us
-        self.wave_interval = 0.0   # us
-        self.wave = []
-        self.time_line = []
-        self.estimate = []
-
-        self.tau = 0.0
-        self.tau_b = 0.0
-        self.w = 0.0
-        self.b = 0.0
-        self.loss = 0.0
-
-        self.v0 = 0.0
-        self.v_inf = 0.0
-
-        self.mock_tau = 0.0
-        self.mock_v0 = 0.0
-        self.mock_v_inf = 0.0
-        self.mock_noise = 0.0
-
-        self.rho = 0.0
-        self.miu = 0.0
-        self.carrier = 0.0
-        self.corrected_rho = 0.0
-        self.corrected_miu = 0.0
-        self.corrected_carrier = 0.0
-
-    def process(self):
-        self.time_line = [self.wave_interval * i for i in range(len(self.wave))]
-
-        if self.success:
-            tau, w, b = self.tau, self.w, self.b
-            self.estimate = [w * math.exp(t / -tau) + b for t in self.time_line]
-
-            self.v0, self.v_inf = b + w, b
-
-    @property
-    def chinese_message(self) -> str:
-        return self.ErrorMessageMapper[self.message]