diff options
| author | Thomas White <taw@physics.org> | 2012-10-22 16:26:41 -0700 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-10-22 16:26:41 -0700 |
| commit | 55787c925f647515c9f1bbe1b0eaf3c6b697a640 (patch) | |
| tree | a64642a6f74ddadeafef31bd5f9f02290db13a62 | |
| parent | 45d15900758729ac1d79c379de3f9c3b22e6915e (diff) | |
Fix (still) broken bad rectangle test
| -rw-r--r-- | libcrystfel/src/peaks.c | 8 |
1 files 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; } |