aboutsummaryrefslogtreecommitdiff
path: root/src/merge.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2018-03-02 16:41:03 +0100
committerThomas White <taw@physics.org>2018-03-02 16:41:03 +0100
commit044b8732cd14584d1c34ab1a21564b20a0d46447 (patch)
treef2c344c8a078c323fe22310a2e4669305cda715c /src/merge.c
parentc8a51805efd3deb068b17b5f79c1afcfd5e8d73d (diff)
Remove unnecessary pmodels
Diffstat (limited to 'src/merge.c')
-rw-r--r--src/merge.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/merge.c b/src/merge.c
index 670f81c6..e60aca15 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -59,7 +59,6 @@ struct merge_queue_args
pthread_rwlock_t full_lock;
Crystal **crystals;
int n_started;
- PartialityModel pmodel;
double push_res;
int use_weak;
long long int n_reflections;
@@ -228,7 +227,7 @@ static void finalise_merge_job(void *vqargs, void *vwargs)
RefList *merge_intensities(Crystal **crystals, int n, int n_threads,
- PartialityModel pmodel, int min_meas,
+ int min_meas,
double push_res, int use_weak)
{
RefList *full;
@@ -244,7 +243,6 @@ RefList *merge_intensities(Crystal **crystals, int n, int n_threads,
qargs.full = full;
qargs.n_started = 0;
qargs.crystals = crystals;
- qargs.pmodel = pmodel;
qargs.push_res = push_res;
qargs.use_weak = use_weak;
qargs.n_reflections = 0;