aboutsummaryrefslogtreecommitdiff
path: root/src/process_image.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2018-05-30 16:47:21 +0200
committerThomas White <taw@physics.org>2018-05-30 16:47:21 +0200
commit7c662b10bc700b28f9c759cf5d445d118f34dcb3 (patch)
tree76c31502ef9d2f777bfb75374674094d40cf1e4f /src/process_image.c
parent5552805ee5dbbf55f652aac3653ac31b8668186f (diff)
parentea2ad46e4199bf57ee033a971d3746ff785ed4cc (diff)
Merge branch 'tom/peakfinder9'
Diffstat (limited to 'src/process_image.c')
-rw-r--r--src/process_image.c24
1 files changed, 22 insertions, 2 deletions
diff --git a/src/process_image.c b/src/process_image.c
index 4b02e694..1d41ae6e 100644
--- a/src/process_image.c
+++ b/src/process_image.c
@@ -3,7 +3,7 @@
*
* The processing pipeline for one image
*
- * Copyright © 2012-2017 Deutsches Elektronen-Synchrotron DESY,
+ * Copyright © 2012-2018 Deutsches Elektronen-Synchrotron DESY,
* a research centre of the Helmholtz Association.
*
* Authors:
@@ -201,7 +201,7 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs,
iargs->use_saturated);
break;
- case PEAK_PEAKFINDER8:
+ case PEAK_PEAKFINDER8:
if ( search_peaks_peakfinder8(&image, 2048,
iargs->threshold,
iargs->min_snr,
@@ -223,6 +223,26 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs,
}
break;
+ case PEAK_PEAKFINDER9:
+ if ( search_peaks_peakfinder9(&image,
+ iargs->min_snr_biggest_pix,
+ iargs->min_snr_peak_pix,
+ iargs->min_snr,
+ iargs->min_sig,
+ iargs->min_peak_over_neighbour,
+ iargs->local_bg_radius) )
+ {
+ if ( image.event != NULL ) {
+ ERROR("Failed to find peaks in image %s"
+ "(event %s).\n", image.filename,
+ get_event_string(image.event));
+ } else {
+ ERROR("Failed to find peaks in image %s.",
+ image.filename);
+ }
+ }
+ break;
+
}
restore_image_data(image.dp, image.det, prefilter);