From b9312ad422ec89b380cb38746e60345f5649e46e Mon Sep 17 00:00:00 2001 From: Thomas White Date: Fri, 17 Apr 2015 11:38:41 +0200 Subject: Tweak rejection --- src/predict-refine.c | 4 ++-- src/process_image.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/predict-refine.c b/src/predict-refine.c index 62e9c128..996509e9 100644 --- a/src/predict-refine.c +++ b/src/predict-refine.c @@ -248,8 +248,8 @@ static int pair_peaks(struct image *image, Crystal *cr, pd = pow(fs - rps[i].peak->fs, 2.0) + pow(ss - rps[i].peak->ss, 2.0); if ( pd > 100.0 * 100.0 ) { - STATUS("rejecting %i %i %i because %f %f -> %f %f\n", - h, k, l, fs, ss, rps[i].peak->fs, rps[i].peak->ss); + //STATUS("rejecting %i %i %i because %f %f -> %f %f\n", + // h, k, l, fs, ss, rps[i].peak->fs, rps[i].peak->ss); continue; } diff --git a/src/process_image.c b/src/process_image.c index c159465f..bfbe496e 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -71,9 +71,9 @@ static void try_refine_autoR(struct image *image, Crystal *cr) refine_radius(cr, image); new_R = crystal_get_profile_radius(cr); - if ( (new_R > 0.02e9) || (new_R > 1.2*old_R) ) { + if ( (new_R > 0.02e9) || (new_R > 1.2*old_R) || (old_R > 0.02e9) ) { STATUS("Rejecting refinement solution with " - "R %.3f -> %.3f nm^-1\n", old_R, new_R); + "R %.3f -> %.3f nm^-1\n", old_R/1e9, new_R/1e9); crystal_set_user_flag(cr, 1); return; } -- cgit v1.2.3