From 7141d24cce2edfcafae40dce6213c108798e9dc5 Mon Sep 17 00:00:00 2001
From: Valerio Mariani <valerio.mariani@desy.de>
Date: Wed, 23 Jul 2014 13:26:30 +0200
Subject: Fixes closest feature detection bug

---
 libcrystfel/src/image.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'libcrystfel/src/image.c')

diff --git a/libcrystfel/src/image.c b/libcrystfel/src/image.c
index f4a3384f..6a0495b1 100644
--- a/libcrystfel/src/image.c
+++ b/libcrystfel/src/image.c
@@ -106,15 +106,26 @@ void image_feature_list_free(ImageFeatureList *flist)
 
 struct imagefeature *image_feature_closest(ImageFeatureList *flist,
                                            double fs, double ss,
-                                           double *d, int *idx)
+                                           double *d, int *idx,
+                                           struct detector *det)
 {
 	int i;
 	double dmin = +HUGE_VAL;
 	int closest = 0;
+	struct panel *p1;
+
+	p1 = find_panel(det, fs, ss);
 
 	for ( i=0; i<flist->n_features; i++ ) {
 
 		double ds;
+		struct panel *p2;
+
+		p2 = find_panel(det, flist->features[i].fs, flist->features[i].ss);
+
+		if ( p1 != p2 ) {
+			continue;
+		}
 
 		ds = distance(flist->features[i].fs, flist->features[i].ss,
 		              fs, ss);
-- 
cgit v1.2.3