SPOT for reflection indicies

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

1 files changed, 5 insertions, 6 deletions

diff --git a/src/image.h b/src/image.h
index 178f363..df505ec 100644
--- a/src/image.h
+++ b/src/image.h
@@ -25,13 +25,11 @@ typedef struct imagefeature_struct {
 	double				y;
 	double				intensity;
 	
-	signed int			h;
-	signed int			k;
-	signed int			l;
-	
 	struct imagefeature_struct	*partner;	/* Partner for this feature (in another feature list) or NULL */
 	double				partner_d;	/* Distance between this feature and its partner, if any. */
 	
+	struct reflection_struct	*reflection;	/* The reflection this was projected from, if any */
+	
 } ImageFeature;
 
 typedef struct {
@@ -71,13 +69,14 @@ typedef struct imagelist_struct {
 
 } ImageList;
 
+#include "reflections.h"
+
 extern ImageList *image_list_new(void);
 extern int image_add(ImageList *list, uint16_t *image, int width, int height, double tilt, ControlContext *ctx);
 extern ImageFeatureList *image_feature_list_new(void);
 extern void image_feature_list_free(ImageFeatureList *flist);
 extern void image_add_feature(ImageFeatureList *flist, double x, double y, ImageRecord *parent, double intensity);
-extern void image_add_feature_index(ImageFeatureList *flist, double x, double y, ImageRecord *parent, double intensity,
-					signed int h, signed int k, signed int l);
+extern void image_add_feature_reflection(ImageFeatureList *flist, double x, double y, ImageRecord *parent, double intensity, Reflection *reflection);
 extern ImageFeature *image_feature_closest(ImageFeatureList *flist, double x, double y, double *d, int *idx);
 extern ImageFeature *image_feature_second_closest(ImageFeatureList *flist, double x, double y, double *d, int *idx);