aboutsummaryrefslogtreecommitdiff
path: root/src/gui_backend_local.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2021-02-09 15:01:16 +0100
committerThomas White <taw@physics.org>2021-02-09 15:01:16 +0100
commitd2d05ecd03e15aa423947b783ba0a343ab34d711 (patch)
treef74603fc3edc549e3c982f68512462ee8c251d6a /src/gui_backend_local.c
parentcb6e6fe539bf0be31ba48c85f0658b5922945422 (diff)
Track half-dataset split filenames through gui_merge_result
Diffstat (limited to 'src/gui_backend_local.c')
-rw-r--r--src/gui_backend_local.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/gui_backend_local.c b/src/gui_backend_local.c
index bbea063c..224d3415 100644
--- a/src/gui_backend_local.c
+++ b/src/gui_backend_local.c
@@ -448,6 +448,8 @@ static void *run_merging(const char *job_title,
struct local_merging_opts *opts = opts_priv;
GFile *hkl_gfile;
char *hkl;
+ char *hkl1;
+ char *hkl2;
snprintf(n_thread_str, 63, "%i", opts->n_threads);
args = merging_command_line(n_thread_str,
@@ -463,7 +465,18 @@ static void *run_merging(const char *job_title,
"crystfel.hkl");
hkl = g_file_get_path(hkl_gfile);
g_object_unref(hkl_gfile);
- add_merge_result(proj, strdup(job_title), hkl);
+
+ hkl_gfile = g_file_get_child(job->workdir,
+ "crystfel.hkl1");
+ hkl1 = g_file_get_path(hkl_gfile);
+ g_object_unref(hkl_gfile);
+
+ hkl_gfile = g_file_get_child(job->workdir,
+ "crystfel.hkl2");
+ hkl2 = g_file_get_path(hkl_gfile);
+ g_object_unref(hkl_gfile);
+
+ add_merge_result(proj, strdup(job_title), hkl, hkl1, hkl2);
return job;
}