aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2018-03-02 17:28:07 +0100
committerThomas White <taw@physics.org>2018-03-02 17:28:07 +0100
commit402b3870e3e1bceb974ad5a402c5e5e898f4c87e (patch)
tree44d7a71e0cbcab2c1c327d761da150bca9c1807a /src
parent044b8732cd14584d1c34ab1a21564b20a0d46447 (diff)
Use old scaling code
Diffstat (limited to 'src')
-rw-r--r--src/partialator.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/partialator.c b/src/partialator.c
index 5fbccd6a..21b02266 100644
--- a/src/partialator.c
+++ b/src/partialator.c
@@ -1325,6 +1325,8 @@ int main(int argc, char *argv[])
/* Create reference data set if we don't already have one */
if ( reference == NULL ) {
+ STATUS("Initial scaling...\n");
+ scale_all(crystals, n_crystals, nthreads);
full = merge_intensities(crystals, n_crystals, nthreads,
min_measurements, push_res, 1);
} else {
@@ -1332,7 +1334,7 @@ int main(int argc, char *argv[])
}
/* Scale everything to the reference */
- STATUS("Initial scaling...\n");
+ STATUS("Initial scaling to reference...\n");
if ( !no_scale ) {
scale_all_to_reference(crystals, n_crystals, full, nthreads);
}
@@ -1360,6 +1362,7 @@ int main(int argc, char *argv[])
/* Create new reference if needed */
if ( reference == NULL ) {
reflist_free(full);
+ scale_all(crystals, n_crystals, nthreads);
full = merge_intensities(crystals, n_crystals, nthreads,
min_measurements,
push_res, 1);
@@ -1404,6 +1407,7 @@ int main(int argc, char *argv[])
STATUS("Final merge...\n");
if ( reference == NULL ) {
reflist_free(full);
+ scale_all(crystals, n_crystals, nthreads);
full = merge_intensities(crystals, n_crystals, nthreads,
min_measurements,
push_res, 1);