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/scaling.c | |
| parent | 71f4e6a5752f6586ec83a8c9606b100f2fe497fb (diff) | |
| parent | 3563ec2b2dbc7d2090ed795a47e35a1b30b8b653 (diff) | |
Merge branch 'tom/logmerge'
Diffstat (limited to 'src/scaling.c')
| -rw-r--r-- | src/scaling.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scaling.c b/src/scaling.c index 68456900..35481982 100644 --- a/src/scaling.c +++ b/src/scaling.c @@ -145,7 +145,7 @@ void scale_all(Crystal **crystals, int n_crystals, int nthreads, int scaleflags) double bef_res; full = merge_intensities(crystals, n_crystals, nthreads, - 2, INFINITY, 0); + 2, INFINITY, 0, 1); old_res = new_res; bef_res = total_log_r(crystals, n_crystals, full, NULL); |