Honour voltage from MRC header if present

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

1 files changed, 6 insertions, 1 deletions

diff --git a/src/mrc.c b/src/mrc.c
index 26b43cb..a01809c 100644
--- a/src/mrc.c
+++ b/src/mrc.c
@@ -21,6 +21,7 @@
 #include "imagedisplay.h"
 #include "itrans.h"
 #include "reflections.h"
+#include "utils.h"
 
 int mrc_read(ControlContext *ctx) {
 
@@ -111,7 +112,11 @@ int mrc_read(ControlContext *ctx) {
 		
 		printf("Image #%3i: tilt=%f omega=%f L=%f\t", i, ext[i].a_tilt, ext[i].tilt_axis, ext[i].magnification);
 		ctx->camera_length = ext[i].magnification;
-		ctx->lambda = 2.51e-12;	/* 200kV. Fudged until Max puts the HT voltage in the MRC headers */
+		if ( ext[i].voltage == 0 ) {
+			ctx->lambda = lambda(200000);
+		} else {
+			ctx->lambda = lambda(1000*ext[i].voltage);
+		}
 		ctx->omega = ext[i].tilt_axis;
 		ctx->pixel_size = ext[i].pixel_size;