diff options
| author | Thomas White <taw@physics.org> | 2017-12-06 15:08:39 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2018-02-27 17:12:42 +0100 |
| commit | 66dd0f49fe53af47885a0857f1b64cd1b841faa2 (patch) | |
| tree | ac807b7a2de0623b2530025258c2ff9ca3d5b091 /src/partialator.c | |
| parent | bc24110f035c62b3e7e873a2b84c47bcf7414f19 (diff) | |
Don't scale when told not to
Diffstat (limited to 'src/partialator.c')
| -rw-r--r-- | src/partialator.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/partialator.c b/src/partialator.c index 124ce2e4..b5f24b1d 100644 --- a/src/partialator.c +++ b/src/partialator.c @@ -1223,7 +1223,9 @@ int main(int argc, char *argv[]) /* Initial rejection, figures of merit etc */ if ( reference == NULL ) { - scale_all(crystals, n_crystals, nthreads, pmodel); + if ( !no_scale ) { + scale_all(crystals, n_crystals, nthreads, pmodel); + } full = merge_intensities(crystals, n_crystals, nthreads, pmodel, min_measurements, push_res, 1); } else { @@ -1272,7 +1274,9 @@ int main(int argc, char *argv[]) check_rejection(crystals, n_crystals, full, max_B); if ( reference == NULL ) { - scale_all(crystals, n_crystals, nthreads, pmodel); + if ( !no_scale ) { + scale_all(crystals, n_crystals, nthreads, pmodel); + } reflist_free(full); full = merge_intensities(crystals, n_crystals, nthreads, pmodel, min_measurements, @@ -1317,7 +1321,9 @@ int main(int argc, char *argv[]) if ( reference == NULL ) { - scale_all(crystals, n_crystals, nthreads, pmodel); + if ( !no_scale ) { + scale_all(crystals, n_crystals, nthreads, pmodel); + } reflist_free(full); full = merge_intensities(crystals, n_crystals, nthreads, pmodel, min_measurements, |