From b9af6d806e147560aa943ce2c1f17034b2ddd462 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 1 Oct 2012 18:34:30 +0200 Subject: Fix exit condition from integrate_peak() This fixes a significant data quality regression introduced by f668e3b3 (21st June 2012) --- libcrystfel/src/peaks.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'libcrystfel/src/peaks.c') diff --git a/libcrystfel/src/peaks.c b/libcrystfel/src/peaks.c index 418e7bde..8d488fea 100644 --- a/libcrystfel/src/peaks.c +++ b/libcrystfel/src/peaks.c @@ -330,10 +330,12 @@ static int integrate_peak(struct image *image, int cfs, int css, if ( dfs*dfs + dss*dss > lim_sq ) continue; /* Strayed off one panel? */ - if ( p_cfs+dfs >= p_w ) continue; - if ( p_css+dss >= p_h ) continue; - if ( p_cfs+dfs < 0 ) continue; - if ( p_css+dss < 0 ) continue; + if ( (p_cfs+dfs >= p_w) || (p_css+dss >= p_h) + || (p_cfs+dfs < 0 ) || (p_css+dss < 0) ) + { + free(bgPkMask); + return 1; + }; idx = dfs+cfs+image->width*(dss+css); -- cgit v1.2.3