Refactor image handling code

Remove itrans-lsq


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

1 files changed, 8 insertions, 10 deletions

diff --git a/src/itrans-zaefferer.c b/src/itrans-zaefferer.c
index 889aac4..d984774 100644
--- a/src/itrans-zaefferer.c
+++ b/src/itrans-zaefferer.c
@@ -16,25 +16,24 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include "control.h"
-#include "imagedisplay.h"
-#include "reflections.h"
 #include "utils.h"
+#include "image.h"
 
 #define PEAK_WINDOW_SIZE 20
 
-unsigned int itrans_peaksearch_zaefferer(ImageRecord *imagerecord, ControlContext *ctx) {
+ImageFeatureList *itrans_peaksearch_zaefferer(ImageRecord *imagerecord) {
 
 	int x, y;
-	unsigned int n_reflections;
 	int width, height;
 	uint16_t *image;
+	ImageFeatureList *flist;
+	
+	flist = image_feature_list_new();
 	
 	image = imagerecord->image;
 	width = imagerecord->width;
 	height = imagerecord->height;
 	
-	n_reflections = 0;
 	for ( x=1; x<width-1; x++ ) {
 		for ( y=1; y<height-1; y++ ) {
 
@@ -85,16 +84,15 @@ unsigned int itrans_peaksearch_zaefferer(ImageRecord *imagerecord, ControlContex
 					assert(mask_y<height);
 					assert(mask_x>=0);
 					assert(mask_y>=0);
-					reflection_add_from_dp(ctx, (mask_x-imagerecord->x_centre), (mask_y-imagerecord->y_centre),
-							imagerecord, image[mask_x + width*mask_y]);
-					n_reflections++;
+					image_add_feature(flist, (mask_x-imagerecord->x_centre), (mask_y-imagerecord->y_centre),
+									imagerecord, image[mask_x + width*mask_y]);
 				}
 				
 			}
 		}
 	}
 
-	return n_reflections;
+	return flist;
 
 }