diff options
author | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2008-01-22 12:43:28 +0000 |
---|---|---|
committer | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2008-01-22 12:43:28 +0000 |
commit | d0cf9ad6d2025cc3ac59e58511dde116d999b7e3 (patch) | |
tree | 50d2b8d24a7c75d9903eb6049b902a7112496850 /src/qdrp.c | |
parent | 61f8a2450fd944920523c0153ea1702f72d751fb (diff) |
Nooooo! Use RADIANS internally...
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@260 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src/qdrp.c')
-rw-r--r-- | src/qdrp.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -20,6 +20,7 @@ #include "readpng.h" #include "control.h" #include "reflections.h" +#include "utils.h" static void qdrp_chomp(char *str) { @@ -65,9 +66,9 @@ static int qdrp_parsefileline(ControlContext *ctx, const char *line) { skip_chars; file = strndup(line+mark, pos-mark); - tilt = strtod(tilt_s, NULL); + tilt = deg2rad(strtod(tilt_s, NULL)); free(tilt_s); - printf("QD: Reading file: Tilt = %f deg, File='%s'\n", tilt, file); + printf("QD: Reading file: Tilt = %f deg, File='%s'\n", rad2deg(tilt), file); if ( readpng_read(file, tilt, ctx) ) { printf("Reconstruction failed.\n"); @@ -102,7 +103,7 @@ static int qdrp_parseline(ControlContext *ctx, const char *line) { } if ( !ctx->omega_set ) { - printf("QD: Parameter 'omega' not specified, and not using tilt-axis-search.\n"); + printf("QD: Parameter 'omega' not specified.\n"); return 1; } @@ -175,10 +176,10 @@ static int qdrp_parseline(ControlContext *ctx, const char *line) { mark = pos; skip_chars; omega_s = strndup(line+mark, pos-mark); - ctx->omega = strtod(omega_s, NULL); + ctx->omega = deg2rad(strtod(omega_s, NULL)); free(omega_s); ctx->omega_set = 1; - printf("QD: omega = %f deg\n", ctx->omega); + printf("QD: omega = %f deg\n", rad2deg(ctx->omega)); } |