diff options
| author | Thomas White <taw@physics.org> | 2015-11-10 16:59:29 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2015-11-18 11:17:57 +0100 |
| commit | af7c721a1c75692ecf9ba9840a5847af90a48b53 (patch) | |
| tree | 5cbc78c975e36514557ab9b5167cbdc5945fb1da /src/partialator.c | |
| parent | c6ac9382f3ec86e1b3e1e558da2f768d7021e470 (diff) | |
merge_intensities(): add use_weak option
Diffstat (limited to 'src/partialator.c')
| -rw-r--r-- | src/partialator.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/partialator.c b/src/partialator.c index 81c5ab37..26c72696 100644 --- a/src/partialator.c +++ b/src/partialator.c @@ -189,13 +189,13 @@ static void write_split(Crystal **crystals, int n_crystals, const char *outfile, } snprintf(tmp, 1024, "%s1", outfile); split = merge_intensities(crystals1, n_crystals1, nthreads, - pmodel, min_measurements, push_res); + pmodel, min_measurements, push_res, 1); STATUS("Writing two-way split to %s ", tmp); write_reflist_2(tmp, split, sym); reflist_free(split); snprintf(tmp, 1024, "%s2", outfile); split = merge_intensities(crystals2, n_crystals2, nthreads, - pmodel, min_measurements, push_res); + pmodel, min_measurements, push_res, 1); STATUS("and %s\n", tmp); write_reflist_2(tmp, split, sym); reflist_free(split); @@ -276,7 +276,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, - pmodel, min_measurements, push_res); + pmodel, min_measurements, push_res, 1); write_reflist_2(tmp, split, sym); reflist_free(split); @@ -995,7 +995,7 @@ int main(int argc, char *argv[]) /* Make initial estimates */ full = merge_intensities(crystals, n_crystals, nthreads, pmodel, - min_measurements, push_res); + min_measurements, push_res, 1); check_rejection(crystals, n_crystals, full); @@ -1020,7 +1020,7 @@ int main(int argc, char *argv[]) /* Re-estimate all the full intensities */ reflist_free(full); full = merge_intensities(crystals, n_crystals, nthreads, - pmodel, min_measurements, push_res); + pmodel, min_measurements, push_res, 1); write_pgraph(full, crystals, n_crystals, i+1); |