From 66dd0f49fe53af47885a0857f1b64cd1b841faa2 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 6 Dec 2017 15:08:39 +0100 Subject: Don't scale when told not to --- src/partialator.c | 12 +++++++++--- 1 file 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, -- cgit v1.2.3