aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2021-03-01 11:43:52 +0100
committerThomas White <taw@physics.org>2021-03-01 11:43:52 +0100
commit2120ed0d92bc42fdba5626265b31ae7bc71f4719 (patch)
tree4e7054d8af268bf1b3b5bde3d929bd652c4b1fed
parent8806f100350a10e371540d38f0790a9d56854a83 (diff)
GUI: Pass --int-radius to indexamajig
Whoops - this was missed out before. This also reduces the precision displayed in the dialog box to reflect what is actually passed to indexamajig.
-rw-r--r--src/crystfelindexingopts.c6
-rw-r--r--src/gui_index.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/src/crystfelindexingopts.c b/src/crystfelindexingopts.c
index eccbf7a6..70b46290 100644
--- a/src/crystfelindexingopts.c
+++ b/src/crystfelindexingopts.c
@@ -1090,13 +1090,13 @@ void crystfel_indexing_opts_set_integration_radii(CrystFELIndexingOpts *opts,
{
char tmp[64];
- snprintf(tmp, 63, "%f", ir_inn);
+ snprintf(tmp, 63, "%.1f", ir_inn);
gtk_entry_set_text(GTK_ENTRY(opts->ir_inn), tmp);
- snprintf(tmp, 63, "%f", ir_mid);
+ snprintf(tmp, 63, "%.1f", ir_mid);
gtk_entry_set_text(GTK_ENTRY(opts->ir_mid), tmp);
- snprintf(tmp, 63, "%f", ir_out);
+ snprintf(tmp, 63, "%.1f", ir_out);
gtk_entry_set_text(GTK_ENTRY(opts->ir_out), tmp);
}
diff --git a/src/gui_index.c b/src/gui_index.c
index 32d69175..1a08fd78 100644
--- a/src/gui_index.c
+++ b/src/gui_index.c
@@ -766,6 +766,11 @@ char **indexamajig_command_line(const char *geom_filename,
add_arg_float(args, n_args++, "push-res",
indexing_params->push_res);
}
+ snprintf(tols, 2048, "--int-radius=%.1f,%.1f,%.1f",
+ indexing_params->ir_inn,
+ indexing_params->ir_mid,
+ indexing_params->ir_out);
+ add_arg(args, n_args++, tols);
/* Stream output */
if ( indexing_params->exclude_nonhits ) add_arg(args, n_args++, "--no-non-hits-in-stream");