From 53cf97428ebfc7f53fee5970342a836bf45017ec Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 7 Jun 2012 14:49:28 +0200 Subject: Use max_adu only for final integration Saturated pixels seem to be OK during initial peak search --- tests/integration_check.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/integration_check.c b/tests/integration_check.c index 2d18ac5a..21c10f79 100644 --- a/tests/integration_check.c +++ b/tests/integration_check.c @@ -64,7 +64,7 @@ static void third_integration_check(struct image *image, int n_trials, } r = integrate_peak(image, 64, 64, &fsp, &ssp, - &intensity, &sigma, 10.0, 15.0, 17.0); + &intensity, &sigma, 10.0, 15.0, 17.0, 0); if ( r == 0 ) { mean_intensity += intensity; @@ -125,7 +125,7 @@ static void fourth_integration_check(struct image *image, int n_trials, } r = integrate_peak(image, 64, 64, &fsp, &ssp, - &intensity, &sigma, 10.0, 15.0, 17.0); + &intensity, &sigma, 10.0, 15.0, 17.0, 0); if ( r == 0 ) { mean_intensity += intensity; @@ -205,7 +205,7 @@ int main(int argc, char *argv[]) /* First check: no intensity -> no peak, or very low intensity */ r = integrate_peak(&image, 64, 64, &fsp, &ssp, &intensity, &sigma, - 10.0, 15.0, 17.0); + 10.0, 15.0, 17.0, 0); STATUS(" First check: integrate_peak() returned %i", r); if ( r == 0 ) { @@ -231,7 +231,7 @@ int main(int argc, char *argv[]) } r = integrate_peak(&image, 64, 64, &fsp, &ssp, &intensity, &sigma, - 10.0, 15.0, 17.0); + 10.0, 15.0, 17.0, 0); if ( r ) { ERROR(" Second check: integrate_peak() returned %i (wrong).\n", r); @@ -273,7 +273,7 @@ int main(int argc, char *argv[]) } r = integrate_peak(&image, 64, 64, &fsp, &ssp, &intensity, &sigma, - 10.0, 15.0, 17.0); + 10.0, 15.0, 17.0, 0); if ( r ) { ERROR(" Fifth check: integrate_peak() returned %i (wrong).\n", r); -- cgit v1.2.3 From b90ddc13d5638aa5e9e4094228f464ce48989eb7 Mon Sep 17 00:00:00 2001 From: Kenneth Beyerlein Date: Wed, 13 Jun 2012 17:32:07 +0200 Subject: Mask peaks in the background calculation of integrate_peak. --- tests/integration_check.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests') diff --git a/tests/integration_check.c b/tests/integration_check.c index 2d18ac5a..7fe98fa0 100644 --- a/tests/integration_check.c +++ b/tests/integration_check.c @@ -203,6 +203,8 @@ int main(int argc, char *argv[]) image.height = 128; memset(image.data, 0, 128*128*sizeof(float)); + image.reflections=reflist_new(); + /* First check: no intensity -> no peak, or very low intensity */ r = integrate_peak(&image, 64, 64, &fsp, &ssp, &intensity, &sigma, 10.0, 15.0, 17.0); -- cgit v1.2.3