From f14479316abf0c438e0ccbd59a4fdf4f8ccfbede Mon Sep 17 00:00:00 2001 From: Yaroslav Gevorkov Date: Thu, 24 May 2018 16:00:04 +0200 Subject: Changed sig_fac to min_snr --- libcrystfel/src/peaks.c | 14 +++++++------- libcrystfel/src/peaks.h | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'libcrystfel/src') diff --git a/libcrystfel/src/peaks.c b/libcrystfel/src/peaks.c index 1ec4ae59..6c48bd3a 100644 --- a/libcrystfel/src/peaks.c +++ b/libcrystfel/src/peaks.c @@ -572,8 +572,8 @@ int search_peaks_peakfinder8(struct image *image, int max_n_peaks, #ifdef HAVE_FDIP -int search_peaks_peakfinder9(struct image *image, float sig_fac_biggest_pix, - float sig_fac_peak_pix, float sig_fac_whole_peak, +int search_peaks_peakfinder9(struct image *image, float min_snr_biggest_pix, + float min_snr_peak_pix, float min_snr_whole_peak, float min_sig, float min_peak_over_neighbour, int window_radius) { @@ -591,9 +591,9 @@ int search_peaks_peakfinder9(struct image *image, float sig_fac_biggest_pix, image->num_peaks = 0; image->num_saturated_peaks = 0; - accuracy_consts.sigmaFactorBiggestPixel = sig_fac_biggest_pix; - accuracy_consts.sigmaFactorPeakPixel = sig_fac_peak_pix; - accuracy_consts.sigmaFactorWholePeak = sig_fac_whole_peak; + accuracy_consts.minSNR_biggestPixel = min_snr_biggest_pix; + accuracy_consts.minSNR_peakPixel = min_snr_peak_pix; + accuracy_consts.minSNR_wholePeak = min_snr_whole_peak; accuracy_consts.minimumSigma = min_sig; accuracy_consts.minimumPeakOversizeOverNeighbours = min_peak_over_neighbour; accuracy_consts.windowRadius = window_radius; @@ -659,8 +659,8 @@ int search_peaks_peakfinder9(struct image *image, float sig_fac_biggest_pix, #else -int search_peaks_peakfinder9(struct image *image, float sig_fac_biggest_pix, - float sig_fac_peak_pix, float sig_fac_whole_peak, +int search_peaks_peakfinder9(struct image *image, float min_snr_biggest_pix, + float min_snr_peak_pix, float min_snr_whole_peak, float min_sig, float min_peak_over_neighbour, int window_radius) { diff --git a/libcrystfel/src/peaks.h b/libcrystfel/src/peaks.h index 06ca8e6c..3abef729 100644 --- a/libcrystfel/src/peaks.h +++ b/libcrystfel/src/peaks.h @@ -57,9 +57,9 @@ extern int search_peaks_peakfinder8(struct image *image, int max_n_peaks, int max_res, int use_saturated); extern int search_peaks_peakfinder9(struct image *image, - float sig_fac_biggest_pix, - float sig_fac_peak_pix, - float sig_fac_whole_peak, float min_sig, + float min_snr_biggest_pix, + float min_snr_peak_pix, + float min_snr_whole_peak, float min_sig, float min_peak_over_neighbour, int window_radius); -- cgit v1.2.3