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/partialator.c | |
| parent | 71f4e6a5752f6586ec83a8c9606b100f2fe497fb (diff) | |
| parent | 3563ec2b2dbc7d2090ed795a47e35a1b30b8b653 (diff) | |
Merge branch 'tom/logmerge'
Diffstat (limited to 'src/partialator.c')
| -rw-r--r-- | src/partialator.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/partialator.c b/src/partialator.c index 78b7173b..86431e4c 100644 --- a/src/partialator.c +++ b/src/partialator.c @@ -190,7 +190,7 @@ static void write_split(Crystal **crystals, int n_crystals, const char *outfile, } snprintf(tmp, 1024, "%s1", outfile); split = merge_intensities(crystals1, n_crystals1, nthreads, - min_measurements, push_res, 1); + min_measurements, push_res, 1, 0); if ( split == NULL ) { ERROR("Not enough crystals for two way split!\n"); @@ -203,7 +203,7 @@ static void write_split(Crystal **crystals, int n_crystals, const char *outfile, reflist_free(split); snprintf(tmp, 1024, "%s2", outfile); split = merge_intensities(crystals2, n_crystals2, nthreads, - min_measurements, push_res, 1); + min_measurements, push_res, 1, 0); STATUS("and %s\n", tmp); write_reflist_2(tmp, split, sym); free_contribs(split); @@ -291,7 +291,7 @@ static void write_custom_split(struct custom_split *csplit, int dsn, STATUS("Writing dataset '%s' to %s (%i crystals)\n", csplit->dataset_names[dsn], tmp, n_crystalsn); split = merge_intensities(crystalsn, n_crystalsn, nthreads, - min_measurements, push_res, 1); + min_measurements, push_res, 1, 0); write_reflist_2(tmp, split, sym); free_contribs(split); reflist_free(split); @@ -1412,7 +1412,7 @@ int main(int argc, char *argv[]) scale_all(crystals, n_crystals, nthreads, scaleflags); } full = merge_intensities(crystals, n_crystals, nthreads, - min_measurements, push_res, 1); + min_measurements, push_res, 1, 0); } else { full = reference; } @@ -1447,7 +1447,7 @@ int main(int argc, char *argv[]) } full = merge_intensities(crystals, n_crystals, nthreads, min_measurements, - push_res, 1); + push_res, 1, 0); } /* else full still equals reference */ check_rejection(crystals, n_crystals, full, max_B, no_deltacchalf); @@ -1495,10 +1495,10 @@ int main(int argc, char *argv[]) } full = merge_intensities(crystals, n_crystals, nthreads, min_measurements, - push_res, 1); + push_res, 1, 0); } else { full = merge_intensities(crystals, n_crystals, nthreads, - min_measurements, push_res, 1); + min_measurements, push_res, 1, 0); } /* Write final figures of merit (no rejection any more) */ |