aboutsummaryrefslogtreecommitdiff
path: root/src/gui_merge.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2020-12-02 16:56:49 +0100
committerThomas White <taw@physics.org>2020-12-02 16:56:49 +0100
commit1a842e532bebbc5bc32dd584526aee5020f17848 (patch)
tree9ce97a2f5fb6964954597eeeb1adfaab517bac64 /src/gui_merge.c
parentfa217f01215149b931fd6de5c2b6d4b008d7112b (diff)
Send all streams to process_hkl/partialator
Diffstat (limited to 'src/gui_merge.c')
-rw-r--r--src/gui_merge.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/gui_merge.c b/src/gui_merge.c
index 95444880..a27934cb 100644
--- a/src/gui_merge.c
+++ b/src/gui_merge.c
@@ -405,13 +405,15 @@ static GSList *process_hkl_command_line(struct gui_result *input,
{
GSList *args = NULL;
char *exe_path;
+ int i;
exe_path = get_crystfel_exe("process_hkl");
if ( exe_path == NULL ) return NULL;
args = g_slist_append(args, exe_path);
- /* FIXME: For each stream */
- args = append_arg_str(args, "input", input->streams[0]);
+ for ( i=0; i<input->n_streams; i++ ) {
+ args = g_slist_append(args, input->streams[i]);
+ }
args = append_arg_str(args, "symmetry", params->symmetry);
@@ -441,13 +443,15 @@ static GSList *partialator_command_line(const char *n_thread_str,
{
GSList *args = NULL;
char *exe_path;
+ int i;
exe_path = get_crystfel_exe("partialator");
if ( exe_path == NULL ) return NULL;
args = g_slist_append(args, exe_path);
- /* FIXME: For each stream */
- args = append_arg_str(args, "input", input->streams[0]);
+ for ( i=0; i<input->n_streams; i++ ) {
+ args = g_slist_append(args, input->streams[i]);
+ }
args = append_arg_str(args, "symmetry", params->symmetry);