diff options
| author | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-11-23 12:54:21 +0000 |
|---|---|---|
| committer | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-11-23 12:54:21 +0000 |
| commit | 058f40b511652002f0635c4f1c37a65e6fbcd156 (patch) | |
| tree | 18ab10d8bba9b90460028ba7d213012ecede5970 /src/reproject.c | |
| parent | 10f4d845158e331da7b2174394c0c6190018e16c (diff) | |
SPOT for reflection indicies
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@207 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src/reproject.c')
| -rw-r--r-- | src/reproject.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/reproject.c b/src/reproject.c index 3768a5e..1fd061a 100644 --- a/src/reproject.c +++ b/src/reproject.c @@ -20,21 +20,23 @@ #include "image.h" /* Attempt to find partners from the feature list of "image" for each feature in "flist". */ -void reproject_partner_features(ImageFeatureList *flist, ImageRecord *image) { +void reproject_partner_features(ImageFeatureList *rflist, ImageRecord *image) { int i; - for ( i=0; i<flist->n_features; i++ ) { + for ( i=0; i<rflist->n_features; i++ ) { + //if ( !reflection_is_easy(rflist->features[i].reflection) ) continue; + double d = 0.0; ImageFeature *partner; int idx; - partner = image_feature_closest(image->features, flist->features[i].x, flist->features[i].y, &d, &idx); + partner = image_feature_closest(image->features, rflist->features[i].x, rflist->features[i].y, &d, &idx); if ( (d <= 20.0) && partner ) { - flist->features[i].partner = partner; - flist->features[i].partner_d = d; + rflist->features[i].partner = partner; + rflist->features[i].partner_d = d; } } @@ -182,8 +184,8 @@ ImageFeatureList *reproject_get_reflections(ImageRecord *image, ReflectionList * if ( (x>=0) && (x<image->width) && (y>=0) && (y<image->height) ) { /* Record the reflection */ - image_add_feature_index(flist, x, y, image, reflection->intensity, - reflection->h, reflection->k, reflection->l); + image_add_feature_reflection(flist, x, y, image, reflection->intensity, reflection); + //printf("Reflection at %f, %f\n", x, y); } /* else it's outside the picture somewhere */ |