aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2015-05-15 17:18:12 +0200
committerThomas White <taw@physics.org>2015-05-19 13:57:53 +0200
commit71b1a3242c2ef6e5419f566324a22c6bfa5119fd (patch)
tree53e70085b3e3cc932d07b8ba713a6056f5f94e63
parent454466a948ddeebbf09dd18489caa37a12eaf04c (diff)
s/lsq_intensities/merge_intensities/
-rw-r--r--src/merge.c5
-rw-r--r--src/merge.h6
-rw-r--r--src/partialator.c16
3 files changed, 14 insertions, 13 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;
diff --git a/src/merge.h b/src/merge.h
index f653ec21..b8af63b8 100644
--- a/src/merge.h
+++ b/src/merge.h
@@ -39,8 +39,8 @@
#include "reflist.h"
#include "geometry.h"
-extern RefList *lsq_intensities(Crystal **crystals, int n, int n_threads,
- PartialityModel pmodel, int min_meas,
- double push_res);
+extern RefList *merge_intensities(Crystal **crystals, int n, int n_threads,
+ PartialityModel pmodel, int min_meas,
+ double push_res);
#endif /* MERGE */
diff --git a/src/partialator.c b/src/partialator.c
index 6844d2ab..8d175d33 100644
--- a/src/partialator.c
+++ b/src/partialator.c
@@ -648,8 +648,8 @@ int main(int argc, char *argv[])
// early_rejection(crystals, n_crystals);
/* Make initial estimates */
- full = lsq_intensities(crystals, n_crystals, nthreads, pmodel,
- min_measurements, push_res);
+ full = merge_intensities(crystals, n_crystals, nthreads, pmodel,
+ min_measurements, push_res);
check_rejection(crystals, n_crystals);
@@ -681,8 +681,8 @@ int main(int argc, char *argv[])
/* Re-estimate all the full intensities */
reflist_free(full);
- full = lsq_intensities(crystals, n_crystals, nthreads,
- pmodel, min_measurements, push_res);
+ full = merge_intensities(crystals, n_crystals, nthreads,
+ pmodel, min_measurements, push_res);
check_rejection(crystals, n_crystals);
@@ -714,13 +714,13 @@ int main(int argc, char *argv[])
}
}
snprintf(tmp, 1024, "%s1", outfile);
- split = lsq_intensities(crystals1, n_crystals1, nthreads,
- pmodel, min_measurements, push_res);
+ split = merge_intensities(crystals1, n_crystals1, nthreads,
+ pmodel, min_measurements, push_res);
write_reflist(tmp, split);
reflist_free(split);
snprintf(tmp, 1024, "%s2", outfile);
- split = lsq_intensities(crystals2, n_crystals2, nthreads,
- pmodel, min_measurements, push_res);
+ split = merge_intensities(crystals2, n_crystals2, nthreads,
+ pmodel, min_measurements, push_res);
write_reflist(tmp, split);
reflist_free(split);