diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2012-07-02 09:44:01 +0200 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2012-07-02 09:44:01 +0200 |
| commit | 81d0cc926576519536d89af8f74272b00acd4fd5 (patch) | |
| tree | 41829ab0e2b7461446d1bad657cef44fad2ebde5 /tests | |
| parent | a4ffb65ff4da923aabdb107cdaf59fccba30b409 (diff) | |
| parent | d7cacb7871a7d49057453b768e420dfb0ab52077 (diff) | |
Merge branch 'master' into tom/speed
Conflicts:
libcrystfel/src/peaks.c
src/indexamajig.c
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/integration_check.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/integration_check.c b/tests/integration_check.c index 2d18ac5a..d43e5fd2 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; @@ -203,9 +203,11 @@ 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); + 10.0, 15.0, 17.0, 0); STATUS(" First check: integrate_peak() returned %i", r); if ( r == 0 ) { @@ -231,7 +233,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 +275,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); |