diff --git a/src/analysis.py b/src/analysis.py index d81a95a..b5aef39 100644 --- a/src/analysis.py +++ b/src/analysis.py @@ -527,7 +527,7 @@ class AnalysisProcedure(QObject): # returns indices of peaks, and dictionary of properties y1_peaks_pre = signal.find_peaks(self.y1_sample, height=height, - distance=10) + distance=self.signal_min_peak_distance) print( 'peak length==>', len( @@ -543,7 +543,7 @@ class AnalysisProcedure(QObject): y1_height = min_y1_p * 0.9 # y1_peaks_avg * 0.726667 y2_peaks_pre = signal.find_peaks(self.y2_sample, height=height, - distance=10) + distance=self.signal_min_peak_distance) ##y2_peaks_avg = np.average(y2_peaks_pre[1]['peak_heights']) min_y2_p = np.min(y2_peaks_pre[1]['peak_heights']) @@ -555,9 +555,11 @@ class AnalysisProcedure(QObject): print(f'AVG = {y1_height}, {y2_height}', flush=True) y1_peaks = signal.find_peaks( - self.y1_sample, height=y1_height, distance=10) + self.y1_sample, height=y1_height, + distance=self.signal_min_peak_distance) y2_peaks = signal.find_peaks( - self.y2_sample, height=y2_height, distance=10) + self.y2_sample, height=y2_height, + distance=self.signal_min_peak_distance) print((f'PEAKS==> {y1_peaks}, {y2_peaks},' + f'{len(y1_peaks[0])}, {len(y2_peaks[0])}'), flush=True) print(y1_peaks[1]['peak_heights'], flush=True)