aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYaroslav Gevorkov <yaroslav.gevorkov@desy.de>2018-05-24 15:03:04 +0200
committerThomas White <taw@physics.org>2018-05-30 16:46:56 +0200
commitd8f176d1902e6fb90747d4065c7e775b86476d5b (patch)
tree523e791542a494d38ea21e6504dab084e0c6a1d5 /src
parent8c0fce3cc328c0edceb756821e1f498d4f0041d8 (diff)
Changed parameter window-radius -> local-bg-radius
Diffstat (limited to 'src')
-rw-r--r--src/indexamajig.c9
-rw-r--r--src/process_image.c2
-rw-r--r--src/process_image.h1
3 files changed, 2 insertions, 10 deletions
diff --git a/src/indexamajig.c b/src/indexamajig.c
index 97024b54..1b1545a9 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -105,13 +105,11 @@ static void show_help(const char *s)
" --max-pix-count=<n> Maximum number of pixels per peak\n"
" (peakfinder8 only) Default: 200\n"
" --local-bg-radius=<n> Radius (pixels) for local background estimation\n"
-" (peakfinder8 only) Default: 3\n"
+" (peakfinder8, peakfinder9 only) Default: 3\n"
" --min-res=<n> Minimum resolution for peak search (in pixels)\n"
" (peakfinder8 only) Default: 0\n"
" --max-res=<n> Maximum resolution for peak search (in pixels)\n"
" (peakfinder8 only) Default: 1200\n"
-" --window-radius=<n> (peakFinder9 only) defines the radius in which the "
-" local background is estimated\n"
" --min-snr-biggest-pix=<n> (peakFinder9 only) min snr of the biggest pixel in "
" the peak\n"
" --min-snr-peak-pix=<n> (peakFinder9 only) min snr of a peak pixel\n"
@@ -275,7 +273,6 @@ int main(int argc, char *argv[])
iargs.min_snr_whole_peak = 9.0;
iargs.min_sig = 11.0;
iargs.min_peak_over_neighbour = -INFINITY;
- iargs.window_radius = 3;
iargs.check_hdf5_snr = 0;
iargs.det = NULL;
iargs.peaks = PEAK_ZAEF;
@@ -425,7 +422,6 @@ int main(int argc, char *argv[])
{"min-snr-peak-pix" ,1, NULL,348},
{"min-sig" ,1, NULL,349},
{"min-peak-over-neighbour" ,1, NULL,350},
- {"window-radius" ,1, NULL,351},
{0, 0, NULL, 0}
};
@@ -769,9 +765,6 @@ int main(int argc, char *argv[])
iargs.min_peak_over_neighbour = strtof(optarg, NULL);
break;
- case 351:
- iargs.window_radius = atoi(optarg);
-
case 0 :
break;
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"
diff --git a/src/process_image.h b/src/process_image.h
index 924b8ac4..7b050e83 100644
--- a/src/process_image.h
+++ b/src/process_image.h
@@ -90,7 +90,6 @@ struct index_args
float min_snr_whole_peak;
float min_sig;
float min_peak_over_neighbour;
- int window_radius;
struct imagefile_field_list *copyme;
int integrate_saturated;
int use_saturated;