diff options
| author | Thomas White <taw@physics.org> | 2020-09-08 12:03:00 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-09-08 16:16:48 +0200 |
| commit | c5abcd75f237c3fc03e13a9550404a3a391b31c6 (patch) | |
| tree | 775cd12819b1eb2b7c512aa14bf5eb2a6659b8cb /src/gui_backend_local.c | |
| parent | 1501d5ff2d0eb6d485beed579d5e1051682d5cc5 (diff) | |
Just use project structure in backends
We have to pass the crystfelproject anyway, to add the new results to
the list. It seems messy to pass everything else separately, when at
this moment the values must be exactly what is in the project structure
anyway.
Diffstat (limited to 'src/gui_backend_local.c')
| -rw-r--r-- | src/gui_backend_local.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/gui_backend_local.c b/src/gui_backend_local.c index 6d385d82..cbb8767b 100644 --- a/src/gui_backend_local.c +++ b/src/gui_backend_local.c @@ -146,14 +146,8 @@ void setup_subprocess(gpointer user_data) static void *run_indexing(const char *job_title, const char *job_notes, - char **filenames, - char **events, - int n_frames, - char *geom_filename, - struct peak_params *peak_search_params, - struct index_params *indexing_params, - void *opts_priv, - struct crystfelproject *proj) + struct crystfelproject *proj, + void *opts_priv) { struct local_indexing_opts *opts = opts_priv; GIOChannel *ioch; @@ -206,23 +200,23 @@ static void *run_indexing(const char *job_title, old_pwd = getcwd(NULL, 0); chdir(workdir); - if ( write_file_list(filenames, events, n_frames) ) { + if ( write_file_list(proj->filenames, proj->events, proj->n_frames) ) { STATUS("Failed to write list\n"); free(job); return NULL; } chdir(old_pwd); - job->n_frames = n_frames; + job->n_frames = proj->n_frames; job->frac_complete = 0.0; snprintf(n_thread_str, 63, "%i", opts->n_processes); - args = indexamajig_command_line(geom_filename, + args = indexamajig_command_line(proj->geom_filename, n_thread_str, "files.lst", "crystfel.stream", - peak_search_params, - indexing_params); + &proj->peak_search_params, + &proj->indexing_params); i = 0; while ( args[i] != NULL ) { |