diff options
| author | Ken Beyerlein <kenneth.beyerlein@desy.de> | 2016-11-11 19:04:36 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2018-06-28 14:38:51 +0200 |
| commit | 7c8bfecf277d065c52c3c66ec061ceaf8df638e6 (patch) | |
| tree | 1a7eced5ba793b5c03afa97ca11ddd9b8d64d935 /src/partialator.c | |
| parent | e3fa832cd31d5dab91426b88d405b810e41cf98f (diff) | |
Merge ln of intensity rather than intensities themselves
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 e152db7c..6d10bc37 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"); @@ -202,7 +202,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); reflist_free(split); @@ -289,7 +289,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); reflist_free(split); @@ -1343,7 +1343,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; } @@ -1376,7 +1376,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); @@ -1423,10 +1423,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) */ |