From 55787c925f647515c9f1bbe1b0eaf3c6b697a640 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 22 Oct 2012 16:26:41 -0700 Subject: Fix (still) broken bad rectangle test --- libcrystfel/src/peaks.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libcrystfel/src/peaks.c b/libcrystfel/src/peaks.c index f5fa6c70..503d534d 100644 --- a/libcrystfel/src/peaks.c +++ b/libcrystfel/src/peaks.c @@ -265,7 +265,9 @@ static int integrate_peak(struct image *image, int cfs, int css, || (p_cfs+dfs < 0 ) || (p_css+dss < 0) ) return 1; /* Wandered into a bad region? */ - if ( in_bad_region(image->det, p_cfs+dfs, p_css+dss) ) { + if ( in_bad_region(image->det, p->min_fs+p_cfs+dfs, + p->min_ss+p_css+dss) ) + { return 1; } @@ -327,7 +329,9 @@ static int integrate_peak(struct image *image, int cfs, int css, || (p_cfs+dfs < 0 ) || (p_css+dss < 0) ) return 1; /* Wandered into a bad region? */ - if ( in_bad_region(image->det, p_cfs+dfs, p_css+dss) ) { + if ( in_bad_region(image->det, p->min_fs+p_cfs+dfs, + p->min_ss+p_css+dss) ) + { return 1; } -- cgit v1.2.3