diff options
| author | Thomas White <taw@physics.org> | 2015-05-15 17:18:12 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2015-05-19 13:57:53 +0200 |
| commit | 71b1a3242c2ef6e5419f566324a22c6bfa5119fd (patch) | |
| tree | 53e70085b3e3cc932d07b8ba713a6056f5f94e63 /src/merge.c | |
| parent | 454466a948ddeebbf09dd18489caa37a12eaf04c (diff) | |
s/lsq_intensities/merge_intensities/
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/merge.c b/src/merge.c index f7a654ea..449f8a87 100644 --- a/src/merge.c +++ b/src/merge.c @@ -187,8 +187,9 @@ static void finalise_merge_job(void *vqargs, void *vwargs) } -RefList *lsq_intensities(Crystal **crystals, int n, int n_threads, - PartialityModel pmodel, int min_meas, double push_res) +RefList *merge_intensities(Crystal **crystals, int n, int n_threads, + PartialityModel pmodel, int min_meas, + double push_res) { RefList *full; RefList *full2; |