From 966ea33baa2d3fdece830b52b1520d408fac9cf2 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 29 Mar 2011 17:51:18 +0200 Subject: Fix in_bad_region() --- src/detector.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/detector.c') diff --git a/src/detector.c b/src/detector.c index bbbdcdf7..00eab10a 100644 --- a/src/detector.c +++ b/src/detector.c @@ -108,9 +108,7 @@ int in_bad_region(struct detector *det, double fs, double ss) int i; /* Determine which panel to use */ - const unsigned int x = fs; - const unsigned int y = ss; - p = find_panel(det, x, y); + p = find_panel(det, fs, ss); /* No panel found -> definitely bad! */ if ( p == NULL ) return 1; @@ -120,8 +118,8 @@ int in_bad_region(struct detector *det, double fs, double ss) xs = (fs-(double)p->min_fs)*p->fsx + (ss-(double)p->min_ss)*p->ssx; ys = (fs-(double)p->min_fs)*p->fsy + (ss-(double)p->min_ss)*p->ssy; - rx = (xs + p->cnx) / p->res; - ry = (ys + p->cny) / p->res; + rx = xs + p->cnx; + ry = ys + p->cny; for ( i=0; in_bad; i++ ) { struct badregion *b = &det->bad[i]; -- cgit v1.2.3