aboutsummaryrefslogtreecommitdiff
path: root/src/qdrp.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/qdrp.c')
-rw-r--r--src/qdrp.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/qdrp.c b/src/qdrp.c
index 5c7df98..aae0c2e 100644
--- a/src/qdrp.c
+++ b/src/qdrp.c
@@ -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));
}