diff --git a/src/DataCalcProcess/AdaptiveSimpsonIntegrate.h b/src/DataCalcProcess/AdaptiveSimpsonIntegrate.h index 8eafc54..881848e 100644 --- a/src/DataCalcProcess/AdaptiveSimpsonIntegrate.h +++ b/src/DataCalcProcess/AdaptiveSimpsonIntegrate.h @@ -1,13 +1,14 @@ -#ifndef ADAPTIVESIMPSONINTEGRATE_H +#ifndef ADAPTIVESIMPSONINTEGRATE_H #define ADAPTIVESIMPSONINTEGRATE_H -namespace AdaptiveSimpsonIntegrate { - #include #include #include #include // 用于格式化输出 + +namespace AdaptiveSimpsonIntegrate { + // 定义被积函数:y = A*exp(-(x-P)²/(2*delt²)) + H/(1+exp((x-P)/W)) + C struct FitFunction { // 拟合公式的参数 @@ -55,7 +56,7 @@ double adaptive_simpson(double a, double b, double eps, const Func& f, double right = simpson(c, b, f); // 精度判断:满足则返回,不满足则递归细分 - if (::std::abs(left + right - whole) <= 15 * eps) { + if (std::abs(left + right - whole) <= 15 * eps) { return left + right + (left + right - whole) / 15.0; } diff --git a/src/MeasureDeviceParamsConfigView/DeviceParamsTableForm.ui b/src/MeasureDeviceParamsConfigView/DeviceParamsTableForm.ui index 34d8935..0980e99 100644 --- a/src/MeasureDeviceParamsConfigView/DeviceParamsTableForm.ui +++ b/src/MeasureDeviceParamsConfigView/DeviceParamsTableForm.ui @@ -88,6 +88,11 @@ 道址数 + + + 数据模式 + + 硬件增益 @@ -120,7 +125,32 @@ - 最大能量范围 + 成形时间 + + + + + 快通道触发阈值 + + + + + CR微分模式 + + + + + 新建列 + + + + + 新建列 + + + + + 输入信号正负极性选择