aboutsummaryrefslogtreecommitdiff
path: root/src/merge.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/merge.c')
-rw-r--r--src/merge.c5
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;