diff options
| author | Thomas White <taw@physics.org> | 2018-05-02 11:59:48 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2018-05-02 14:39:59 +0200 |
| commit | 928bb3071bb73650404161481d450d09ed25ae9a (patch) | |
| tree | feddf6a04998d87d48028b89f90dd0f75c8e7a65 /src/partialator.c | |
| parent | 5996d68002f2f82393d7253b03eb283dd14746b1 (diff) | |
Remove scale_all_to_reference
Diffstat (limited to 'src/partialator.c')
| -rw-r--r-- | src/partialator.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/partialator.c b/src/partialator.c index a17e1b24..fc3f86c2 100644 --- a/src/partialator.c +++ b/src/partialator.c @@ -1334,12 +1334,6 @@ int main(int argc, char *argv[]) full = reference; } - /* Scale everything to the reference */ - STATUS("Initial scaling to reference...\n"); - if ( !no_scale ) { - scale_all_to_reference(crystals, n_crystals, full, nthreads); - } - /* Check rejection and write figures of merit */ check_rejection(crystals, n_crystals, full, max_B); show_all_residuals(crystals, n_crystals, full); @@ -1356,14 +1350,14 @@ int main(int argc, char *argv[]) if ( !no_pr ) { refine_all(crystals, n_crystals, full, nthreads, pmodel, 0, i+1, no_logs, sym, amb); - } else if ( !no_scale ) { - scale_all_to_reference(crystals, n_crystals, full, nthreads); } /* Create new reference if needed */ if ( reference == NULL ) { reflist_free(full); - scale_all(crystals, n_crystals, nthreads); + if ( !no_scale ) { + scale_all(crystals, n_crystals, nthreads); + } full = merge_intensities(crystals, n_crystals, nthreads, min_measurements, push_res, 1); @@ -1408,12 +1402,13 @@ int main(int argc, char *argv[]) STATUS("Final merge...\n"); if ( reference == NULL ) { reflist_free(full); - scale_all(crystals, n_crystals, nthreads); + if ( !no_scale ) { + scale_all(crystals, n_crystals, nthreads); + } full = merge_intensities(crystals, n_crystals, nthreads, min_measurements, push_res, 1); } else { - scale_all_to_reference(crystals, n_crystals, reference, nthreads); full = merge_intensities(crystals, n_crystals, nthreads, min_measurements, push_res, 1); } |