aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2018-05-24 16:26:39 +0200
committerThomas White <taw@physics.org>2018-05-30 16:46:56 +0200
commitaae5b9636a9efe1ece80a3b823956a75d4149dca (patch)
tree0cf2b14b12d6064c04efc716c3fdae8b9c6eaeaf
parentd8f176d1902e6fb90747d4065c7e775b86476d5b (diff)
Use only one min-snr option
-rw-r--r--doc/man/indexamajig.13
-rw-r--r--src/indexamajig.c2
-rw-r--r--src/process_image.c2
-rw-r--r--src/process_image.h1
4 files changed, 2 insertions, 6 deletions
diff --git a/doc/man/indexamajig.1 b/doc/man/indexamajig.1
index 1d19bfad..37e80801 100644
--- a/doc/man/indexamajig.1
+++ b/doc/man/indexamajig.1
@@ -256,8 +256,7 @@ Set the square of the gradient threshold for peak detection using \fB--peaks=zae
.PD 0
.IP \fB--min-snr=\fR\fIsnr\fR
.PD
-
-Set the minimum I/sigma(I) for peak detection when using \fB--peaks=zaef\fR, \fB--peaks=peakfinder8\fR or \fB--peaks=peakfinder9\fR. The default is \fB--min-snr=5\fR for \fB--peaks=zaef\fR and \fB--peaks=peakfinder8\fR, \fB--min-snr=9\fR for \fB--peaks=peakfinder9\fR.
+Set the minimum I/sigma(I) for peak detection when using \fB--peaks=zaef\fR, \fB--peaks=peakfinder8\fR or \fB--peaks=peakfinder9\fR. The default is \fB--min-snr=5\fR.
.PD 0
.IP \fB--min-snr-biggest-pix=<n>\fR
diff --git a/src/indexamajig.c b/src/indexamajig.c
index 1b1545a9..4a790a17 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -270,7 +270,6 @@ int main(int argc, char *argv[])
iargs.local_bg_radius = 3;
iargs.min_snr_biggest_pix = 7.0; /* peak finder 9 */
iargs.min_snr_peak_pix = 6.0;
- iargs.min_snr_whole_peak = 9.0;
iargs.min_sig = 11.0;
iargs.min_peak_over_neighbour = -INFINITY;
iargs.check_hdf5_snr = 0;
@@ -521,7 +520,6 @@ int main(int argc, char *argv[])
case 311 :
iargs.min_snr = strtof(optarg, NULL);
- iargs.min_snr_whole_peak = iargs.min_snr;
break;
case 313 :
diff --git a/src/process_image.c b/src/process_image.c
index c12ec3b5..6f4ab192 100644
--- a/src/process_image.c
+++ b/src/process_image.c
@@ -227,7 +227,7 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs,
if ( search_peaks_peakfinder9(&image,
iargs->min_snr_biggest_pix,
iargs->min_snr_peak_pix,
- iargs->min_snr_whole_peak,
+ iargs->min_snr,
iargs->min_sig,
iargs->min_peak_over_neighbour,
iargs->local_bg_radius) )
diff --git a/src/process_image.h b/src/process_image.h
index 7b050e83..52f063fd 100644
--- a/src/process_image.h
+++ b/src/process_image.h
@@ -87,7 +87,6 @@ struct index_args
int min_peaks;
float min_snr_biggest_pix;
float min_snr_peak_pix;
- float min_snr_whole_peak;
float min_sig;
float min_peak_over_neighbour;
struct imagefile_field_list *copyme;