diff --git a/x_ray_data_processor.py b/x_ray_data_processor.py index 8fbd6b1..e4144a6 100644 --- a/x_ray_data_processor.py +++ b/x_ray_data_processor.py @@ -75,6 +75,28 @@ class XRayDataProcessor: print(f"计算平滑数据和导数出错: {str(e)}") return False + def find_outer_peak(self, data, sigma=2.0, peak_threshold=0.15): + """ + 找到一阶导数绝对值的主要极值点,作为圆弧的外侧 + """ + # 1. 平滑数据,消除噪声 + smoothed = gaussian_filter1d(data, sigma=sigma) + + # 2. 从头开始,若第data[k] - data[k + 50] > data[k] * 0.2,说明k是外侧极值点 + outer_peaks = [100, len(data) - 100] + for k in range(len(data) - 50): + if smoothed[k] - smoothed[k + 50] > smoothed[k] * peak_threshold: + outer_peaks[0] = k + break + + # 3. 从尾开始,若第data[k] - data[k - 50] > data[k] * 0.2,说明k是外侧极值点 + for k in range(len(data) - 50, 0, -1): + if smoothed[k] - smoothed[k - 50] > smoothed[k] * peak_threshold: + outer_peaks[1] = k + break + + return outer_peaks + def find_derivative_peaks(self, deriv_data, sigma=5, peak_threshold=0.3): """ 精准找出一阶导数绝对值的主要极值点 @@ -155,23 +177,21 @@ class XRayDataProcessor: def _find_spans_for_channel(self, channel): """为指定通道寻找合适的区间""" - derivative = self.derivative_data[channel] + data = self.channel_data[channel] n = len(self.index_data) - abs_derivative = np.abs(derivative) - - potential_extremes = self.find_derivative_peaks(abs_derivative) + potential_extremes = self.find_outer_peak(data) # 至少有两个极值点,选择第一个和最后一个 p1 = potential_extremes[0] p2 = potential_extremes[-1] # 计算区间边界: [p1*0.2, p1*0.9], [(n-p2)*0.1+p2, (n-p2)*0.7+p2] - left_start_idx = max(0, int(p1 * 0.1)) - left_end_idx = min(n-1, int(p1 * 0.99)) + left_start_idx = max(0, int(p1 * 0.01)) + left_end_idx = min(n-1, int(p1)) - right_start_idx = min(n-1, int((n - p2) * 0.01 + p2)) - right_end_idx = min(n-1, int(n - (n - p2) * 0.1)) + right_start_idx = min(n-1, p2) + right_end_idx = min(n-1, int(n - (n - p2) * 0.01)) # 转换为INDEX值 left_span = (self.index_data[left_start_idx], self.index_data[left_end_idx]) @@ -274,10 +294,10 @@ class XRayDataProcessor: def _analyze_channel(self, channel_name, Q_data, index_data): """分析单个通道的数据""" # 参数设置 - initial_guess = [np.max(Q_data)*1.5, 0.4, np.max(index_data) * 0.5] + initial_guess = [np.max(Q_data)*2, 0.4, np.max(index_data) * 0.5] bounds = ( [np.max(Q_data), 0.3, np.max(index_data) * 0.2], - [2*np.max(Q_data), 0.5, np.max(index_data) * 0.8] + [3*np.max(Q_data), 0.5, np.max(index_data) * 0.8] ) # 执行拟合