Feature centering

git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@192 bf6ca9ba-c028-0410-8290-897cf20841d1

1 files changed, 1 insertions, 31 deletions

diff --git a/src/reproject.c b/src/reproject.c
index 2ff7e6c..095b39a 100644
--- a/src/reproject.c
+++ b/src/reproject.c
@@ -178,36 +178,6 @@ ImageFeatureList *reproject_get_reflections(ImageRecord *image, ReflectionList *
 
 }
 
-/* Attempt to find the partner for "feature" from the feature list of "image" */
-static ImageFeature *reproject_find_partner(ImageFeature *feature, ImageRecord *image, double *d) {
-
-	int i;
-	double dmin = +HUGE_VAL;
-	int closest;
-	closest = 0;
-	
-	for ( i=0; i<image->features->n_features; i++ ) {
-	
-		double d;
-		
-		d = distance(image->features->features[i].x, image->features->features[i].y, feature->x, feature->y);
-	
-		if ( d < dmin ) {
-			dmin = d;
-			closest = i;
-		}
-	
-	}
-	
-	if ( dmin <= 20.0 ) {
-		*d = dmin;
-		return &image->features->features[closest];
-	}
-	
-	return NULL; /* No suitable partner found */
-
-}
-
 /* Attempt to find partners from the feature list of "image" for each feature in "flist". */
 void reproject_partner_features(ImageFeatureList *flist, ImageRecord *image) {
 
@@ -217,7 +187,7 @@ void reproject_partner_features(ImageFeatureList *flist, ImageRecord *image) {
 	
 		double d = 0.0;
 		
-		flist->features[i].partner = reproject_find_partner(&flist->features[i], image, &d);
+		flist->features[i].partner = image_feature_closest(image->features, flist->features[i].x, flist->features[i].y, &d);
 		flist->features[i].partner_d = d;
 	
 	}