From 8f99dad3c42ab08d631b1ac02b195b33944c7240 Mon Sep 17 00:00:00 2001 From: Yaroslav Gevorkov Date: Thu, 24 May 2018 10:07:11 +0200 Subject: Add "peakfinder9" --- src/process_image.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/process_image.c') diff --git a/src/process_image.c b/src/process_image.c index 4b02e694..be4fa094 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -223,6 +223,19 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, } break; + case PEAK_PEAKFINDER9: + if ( search_peaks_peakfinder9(&image, + iargs->sig_fac_biggest_pix, + iargs->sig_fac_peak_pix, + iargs->sig_fac_whole_peak, iargs->min_sig, + iargs->min_peak_over_neighbour, + iargs->window_radius) ) + { + ERROR("Couldn't get enough memory to perform " + "peakFinder9.\n"); + } + break; + } restore_image_data(image.dp, image.det, prefilter); -- cgit v1.2.3 From c1be9fab0693fb4e51755ea83954e6cf4c65f7f0 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 24 May 2018 10:30:14 +0200 Subject: Formatting --- src/process_image.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/process_image.c') diff --git a/src/process_image.c b/src/process_image.c index be4fa094..5aaff408 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -225,11 +225,12 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, case PEAK_PEAKFINDER9: if ( search_peaks_peakfinder9(&image, - iargs->sig_fac_biggest_pix, - iargs->sig_fac_peak_pix, - iargs->sig_fac_whole_peak, iargs->min_sig, - iargs->min_peak_over_neighbour, - iargs->window_radius) ) + iargs->sig_fac_biggest_pix, + iargs->sig_fac_peak_pix, + iargs->sig_fac_whole_peak, + iargs->min_sig, + iargs->min_peak_over_neighbour, + iargs->window_radius) ) { ERROR("Couldn't get enough memory to perform " "peakFinder9.\n"); -- cgit v1.2.3 From 4f087e3954699ba96d2915af8d82fa10ebd53280 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 24 May 2018 10:31:53 +0200 Subject: Update authorship and copyright dates --- src/process_image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/process_image.c') diff --git a/src/process_image.c b/src/process_image.c index 5aaff408..b4b2eb70 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: -- cgit v1.2.3 From d3f9ed0a184bea13ba36c4291b593ecd7a91fc14 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 24 May 2018 10:32:43 +0200 Subject: Generalise peakfinder9 error messages, and fail if not compiled in --- src/process_image.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/process_image.c') diff --git a/src/process_image.c b/src/process_image.c index b4b2eb70..57f40142 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -232,8 +232,14 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, iargs->min_peak_over_neighbour, iargs->window_radius) ) { - ERROR("Couldn't get enough memory to perform " - "peakFinder9.\n"); + 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; -- cgit v1.2.3 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 --- src/process_image.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/process_image.c') diff --git a/src/process_image.c b/src/process_image.c index 57f40142..e8bcd911 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -225,9 +225,9 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, case PEAK_PEAKFINDER9: if ( search_peaks_peakfinder9(&image, - iargs->sig_fac_biggest_pix, - iargs->sig_fac_peak_pix, - iargs->sig_fac_whole_peak, + iargs->min_snr_biggest_pix, + iargs->min_snr_peak_pix, + iargs->min_snr_whole_peak, iargs->min_sig, iargs->min_peak_over_neighbour, iargs->window_radius) ) -- cgit v1.2.3 From d8f176d1902e6fb90747d4065c7e775b86476d5b Mon Sep 17 00:00:00 2001 From: Yaroslav Gevorkov Date: Thu, 24 May 2018 15:03:04 +0200 Subject: Changed parameter window-radius -> local-bg-radius --- src/process_image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/process_image.c') diff --git a/src/process_image.c b/src/process_image.c index e8bcd911..c12ec3b5 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -230,7 +230,7 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, iargs->min_snr_whole_peak, iargs->min_sig, iargs->min_peak_over_neighbour, - iargs->window_radius) ) + iargs->local_bg_radius) ) { if ( image.event != NULL ) { ERROR("Failed to find peaks in image %s" -- cgit v1.2.3 From aae5b9636a9efe1ece80a3b823956a75d4149dca Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 24 May 2018 16:26:39 +0200 Subject: Use only one min-snr option --- src/process_image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/process_image.c') 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) ) -- cgit v1.2.3 From ea2ad46e4199bf57ee033a971d3746ff785ed4cc Mon Sep 17 00:00:00 2001 From: Thomas White Date: Fri, 25 May 2018 17:26:01 +0200 Subject: Whitespace fussiness --- src/process_image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/process_image.c') diff --git a/src/process_image.c b/src/process_image.c index 6f4ab192..1d41ae6e 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -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, -- cgit v1.2.3