From 7b8593424fd230182ca67e320e35159c76066c12 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Fri, 20 Feb 2015 18:48:07 +0100 Subject: in_bad_region(): fs/ss bad regions use orig coordinates --- libcrystfel/src/detector.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'libcrystfel') diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c index 4d1a15e5..4c7295fe 100644 --- a/libcrystfel/src/detector.c +++ b/libcrystfel/src/detector.c @@ -344,10 +344,17 @@ int in_bad_region(struct detector *det, double fs, double ss) if ( b->is_fsss ) { - if ( fs < b->min_fs ) continue; - if ( fs > b->max_fs ) continue; - if ( ss < b->min_ss ) continue; - if ( ss > b->max_ss ) continue; + int nfs, nss; + + /* fs/ss bad regions are specified according to the + * original coordinates */ + nfs = (fs-p->min_fs) + p->orig_min_fs; + nss = (ss-p->min_ss) + p->orig_min_ss; + + if ( nfs < b->min_fs ) continue; + if ( nfs > b->max_fs ) continue; + if ( nss < b->min_ss ) continue; + if ( nss > b->max_ss ) continue; } else { -- cgit v1.2.3