Be a lot more clear about which things are properties of images and which

belong to the control context.


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

1 files changed, 6 insertions, 19 deletions

diff --git a/src/itrans.c b/src/itrans.c
index dbb164f..db89736 100644
--- a/src/itrans.c
+++ b/src/itrans.c
@@ -14,38 +14,25 @@
 #include <config.h>
 #endif
 
-#include <stdint.h>
-#include <gsl/gsl_matrix.h>
-
 #include "control.h"
-#include "imagedisplay.h"
 #include "reflections.h"
 #include "itrans-threshold.h"
 #include "itrans-zaefferer.h"
 #include "itrans-lsq.h"
 #include "itrans-stat.h"
 
-void itrans_process_image(int16_t *image, ControlContext *ctx, double tilt_degrees) {
+void itrans_process_image(ImageRecord image, ControlContext *ctx) {
 	
 	unsigned int n_reflections;
-	ImageDisplay *imagedisplay = NULL;
-	
-	ctx->first_image = 0;
-	if ( ctx->first_image ) {
-		imagedisplay = imagedisplay_open(image, ctx->width, ctx->height, "Image Display");
-		imagedisplay_add_tilt_axis(imagedisplay, ctx, ctx->omega);
-	}
 	
 	switch ( ctx->psmode ) {
-		case PEAKSEARCH_THRESHOLD : n_reflections = itrans_peaksearch_threshold(image, ctx, tilt_degrees, imagedisplay); break;
-		case PEAKSEARCH_ADAPTIVE_THRESHOLD : n_reflections = itrans_peaksearch_adaptive_threshold(image, ctx, tilt_degrees, imagedisplay); break;
-		case PEAKSEARCH_LSQ : n_reflections = itrans_peaksearch_lsq(image, ctx, tilt_degrees, imagedisplay); break;
-		case PEAKSEARCH_ZAEFFERER : n_reflections = itrans_peaksearch_zaefferer(image, ctx, tilt_degrees, imagedisplay); break;
-		case PEAKSEARCH_STAT : n_reflections = itrans_peaksearch_stat(image, ctx, tilt_degrees, imagedisplay); break;
+		case PEAKSEARCH_THRESHOLD : itrans_peaksearch_threshold(image, ctx); break;
+		case PEAKSEARCH_ADAPTIVE_THRESHOLD : itrans_peaksearch_adaptive_threshold(image, ctx); break;
+		case PEAKSEARCH_LSQ : itrans_peaksearch_lsq(image, ctx); break;
+		case PEAKSEARCH_ZAEFFERER : itrans_peaksearch_zaefferer(image, ctx); break;
+		case PEAKSEARCH_STAT : itrans_peaksearch_stat(image, ctx); break;
 		default: n_reflections = 0;
 	}
 	
-	ctx->first_image = 0;
-	
 }