Implement fast reprojection

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

1 files changed, 13 insertions, 19 deletions

diff --git a/src/control.c b/src/control.c
index b626d7c..e0318c0 100644
--- a/src/control.c
+++ b/src/control.c
@@ -13,31 +13,25 @@
 
 #include "control.h"
 
-int control_add_image_ps(ControlContext *ctx, int16_t *image, int width, int height, double tilt, double omega, double pixel_size) {
+int control_add_image(ControlContext *ctx, int16_t *image, int width, int height, double tilt) {
 
 	ctx->images[ctx->n_images].tilt = tilt;
-	ctx->images[ctx->n_images].omega = omega;
-	ctx->images[ctx->n_images].pixel_size = pixel_size;
-	ctx->images[ctx->n_images].camera_len = 0;
+	ctx->images[ctx->n_images].omega = ctx->omega;
 	ctx->images[ctx->n_images].image = image;
 	ctx->images[ctx->n_images].width = width;
 	ctx->images[ctx->n_images].height = height;
+	ctx->images[ctx->n_images].lambda = ctx->lambda;
+	ctx->images[ctx->n_images].fmode = ctx->fmode;
 	
-	ctx->n_images++;
-	
-	return ctx->n_images - 1;
-
-}
-
-int control_add_image_cl(ControlContext *ctx, int16_t *image, int width, int height, double tilt, double omega, double camera_len) {
-
-	ctx->images[ctx->n_images].tilt = tilt;
-	ctx->images[ctx->n_images].omega = omega;
-	ctx->images[ctx->n_images].pixel_size = 0;
-	ctx->images[ctx->n_images].camera_len = camera_len;
-	ctx->images[ctx->n_images].image = image;
-	ctx->images[ctx->n_images].width = width;
-	ctx->images[ctx->n_images].height = height;
+	if ( ctx->fmode == FORMULATION_PIXELSIZE ) {
+		ctx->images[ctx->n_images].pixel_size = ctx->pixel_size;
+		ctx->images[ctx->n_images].camera_len = 0;
+		ctx->images[ctx->n_images].resolution = ctx->resolution;
+	} else if ( ctx->fmode == FORMULATION_CLEN ) {
+		ctx->images[ctx->n_images].pixel_size = 0;
+		ctx->images[ctx->n_images].camera_len = ctx->camera_length;
+		ctx->images[ctx->n_images].resolution = 0;
+	}
 	
 	ctx->n_images++;