diff options
| author | Thomas White <taw@physics.org> | 2018-11-14 09:58:31 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2018-11-14 09:58:31 +0100 |
| commit | c9bc96b35c89a4eb13557620556cb1b58f659d1a (patch) | |
| tree | 695203a431a95b5acb032864d521bc572210883e /src/merge.h | |
| parent | 71f4e6a5752f6586ec83a8c9606b100f2fe497fb (diff) | |
| parent | 3563ec2b2dbc7d2090ed795a47e35a1b30b8b653 (diff) | |
Merge branch 'tom/logmerge'
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/merge.h b/src/merge.h index b33afdea..9bc54126 100644 --- a/src/merge.h +++ b/src/merge.h @@ -40,7 +40,8 @@ #include "geometry.h" extern RefList *merge_intensities(Crystal **crystals, int n, int n_threads, - int min_meas, double push_res, int use_weak); + int min_meas, double push_res, int use_weak, + int ln_merge); extern double residual(Crystal *cr, const RefList *full, int free, int *pn_used, const char *filename); |