Preparation for handing precessed data

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

1 files changed, 8 insertions, 4 deletions

diff --git a/src/main.c b/src/main.c
index 528d508..4b42809 100644
--- a/src/main.c
+++ b/src/main.c
@@ -30,7 +30,7 @@
 #include "qdrp.h"
 #include "ipr.h"
 #include "cache.h"
-#include "structure.h"
+#include "mapping.h"
 
 static gint main_method_window_response(GtkWidget *method_window, gint response, ControlContext *ctx) {
 
@@ -56,6 +56,7 @@ static gint main_method_window_response(GtkWidget *method_window, gint response,
 		gtk_widget_destroy(method_window);
 		while ( gtk_events_pending() ) gtk_main_iteration();
 		
+		/* Load the input */
 		if ( ctx->inputfiletype == INPUT_QDRP ) {
 			val = qdrp_read(ctx);
 		} else if ( ctx->inputfiletype == INPUT_MRC ) {
@@ -65,16 +66,18 @@ static gint main_method_window_response(GtkWidget *method_window, gint response,
 			val=0;
 		}
 		
+		if ( ctx->inputfiletype != INPUT_CACHE ) {
+			mapping_create(ctx);
+		}
+		
 		if ( (ctx->inputfiletype != INPUT_CACHE) && !val && (ctx->reflectionctx) ) {
 			cache_save(ctx->filename, ctx->reflectionctx);			
 		}
 		
 		if ( !val && (ctx->rmode == RECONSTRUCTION_PREDICTION) && (ctx->reflectionctx) ) {
-			val = ipr_reduce(ctx);
+			val = ipr_refine(ctx);
 		}
 		
-		//dump_histogram(ctx->reflectionctx);
-		
 		if ( !val && (ctx->reflectionctx) ) {
 			displaywindow_open(ctx);
 		} else {
@@ -222,3 +225,4 @@ int main(int argc, char *argv[]) {
 	return 0;
 	
 }
+