aboutsummaryrefslogtreecommitdiff
path: root/src/gui_index.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2021-03-19 14:19:24 +0100
committerThomas White <taw@physics.org>2021-03-19 14:19:24 +0100
commit6a4d681da9ac355b3b8d73861a6dcb5bc42ef2ba (patch)
treeb7978720281c9c02db4529e79f7c92b1009e00c4 /src/gui_index.c
parentefb6ec7b3899a90f8e1a977895e23042c35040f7 (diff)
parent99c7fa94b9aecf7b22d57410edb5a8665a5f10f7 (diff)
Merge branch 'tom/fromfile'
Diffstat (limited to 'src/gui_index.c')
-rw-r--r--src/gui_index.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui_index.c b/src/gui_index.c
index c04ee197..9b72ca10 100644
--- a/src/gui_index.c
+++ b/src/gui_index.c
@@ -494,6 +494,7 @@ static void run_indexing_once(struct crystfelproject *proj)
XGandalfOptions *xgandalf_opts;
PinkIndexerOptions *pinkIndexer_opts;
FelixOptions *felix_opts;
+ FromFileOptions *fromfile_opts;
char *old_cwd;
char *tmpdir;
int r;
@@ -522,14 +523,16 @@ static void run_indexing_once(struct crystfelproject *proj)
default_method_options(&taketwoopts,
&xgandalf_opts,
&pinkIndexer_opts,
- &felix_opts);
+ &felix_opts,
+ &fromfile_opts);
ipriv = setup_indexing(methods, cell,
proj->indexing_params.tols,
indexing_flags(&proj->indexing_params),
proj->cur_image->lambda, 1,
taketwoopts, xgandalf_opts,
- pinkIndexer_opts, felix_opts);
+ pinkIndexer_opts, felix_opts,
+ NULL);
free(methods);
index_pattern(proj->cur_image, ipriv);