diff options
| author | Ken Beyerlein <kenneth.beyerlein@desy.de> | 2016-11-11 19:04:36 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2018-06-28 14:38:51 +0200 |
| commit | 7c8bfecf277d065c52c3c66ec061ceaf8df638e6 (patch) | |
| tree | 1a7eced5ba793b5c03afa97ca11ddd9b8d64d935 /src/merge.h | |
| parent | e3fa832cd31d5dab91426b88d405b810e41cf98f (diff) | |
Merge ln of intensity rather than intensities themselves
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); |