Give image centres in qdrp.rc if desired

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

1 files changed, 2 insertions, 17 deletions

diff --git a/src/main.c b/src/main.c
index f957eb3..0750f14 100644
--- a/src/main.c
+++ b/src/main.c
@@ -32,6 +32,7 @@
 #include "cache.h"
 #include "mapping.h"
 #include "prealign.h"
+#include "control.h"
 
 void main_do_reconstruction(ControlContext *ctx) {
 
@@ -212,7 +213,7 @@ int main(int argc, char *argv[]) {
 	}
 	
 	filename = basename(argv[1]);
-	ctx = malloc(sizeof(ControlContext));
+	ctx = control_ctx_new();
 	type = INPUT_NONE;
 	
 	if ( qdrp_is_qdrprc(filename) ) {
@@ -229,22 +230,6 @@ int main(int argc, char *argv[]) {
 		return 1;
 	}
 	
-	#if 0
-	if ( strcmp(filename, "qdrp.rc") == 0 ) {
-		printf("QDRP input file detected.\n");
-		ctx->inputfiletype = INPUT_QDRP;
-	} else if ( strcmp(filename+(strlen(filename)-4), ".mrc") == 0 ) {
-		printf("MRC tomography file detected.\n");
-		ctx->inputfiletype = INPUT_MRC;
-	} else if ( strcmp(filename, "reflect.cache") == 0 ) {
-		printf("reflect.cache detected.\n");
-		ctx->inputfiletype = INPUT_CACHE;
-	} else {
-		fprintf(stderr, "Unrecognised input file type\n");
-		return 1;
-	}
-	#endif
-	
 	ctx->filename = strdup(argv[1]);
 	ctx->n_images = 0;