diff options
| author | Thomas White <taw@physics.org> | 2021-07-15 15:13:03 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2021-07-15 17:05:05 +0200 |
| commit | c5a89386f273473954ec5f9e460052c175236c16 (patch) | |
| tree | 897babdf9e14812de44260bc5305e55ea4823b7a /src/gui_merge.h | |
| parent | 81071755af6d46edd21735ecd749b72695629f11 (diff) | |
GUI: Run all jobs with same CWD as GUI itself
This requires changing all the paths to relative ones.
Previously, the jobs ran with their CWDs set to the corresponding
"result" folder. The trouble is, this breaks everything that uses a
relative location: image filenames, mask/satmap files referenced by the
geometry, etc.
Note that this change also means that the temporary folders
("indexamajig.XXX") are now produced in the top-level working directory.
Eventually, a GUI option should be added to allow these folders to be
put somewhere better (i.e. somewhere fast).
Closes: https://gitlab.desy.de/thomas.white/crystfel/-/issues/44
Diffstat (limited to 'src/gui_merge.h')
| -rw-r--r-- | src/gui_merge.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui_merge.h b/src/gui_merge.h index e3f947c7..36b077aa 100644 --- a/src/gui_merge.h +++ b/src/gui_merge.h @@ -41,7 +41,10 @@ extern int write_merge_script(const char *filename, struct gui_indexing_result *input, const char *n_thread_str, struct merging_params *params, - const char *out_hkl); + const char *out_hkl, + const char *stdout_filename, + const char *stderr_filename, + const char *harvest_filename); extern double read_merge_progress(const char *logfile_str, enum gui_job_type type); |