aboutsummaryrefslogtreecommitdiff
path: root/src/merge.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2018-09-10 16:48:31 +0200
committerThomas White <taw@physics.org>2018-09-10 16:48:31 +0200
commite8fa57ba93687fbd6841cb3a3d09c87037b5c713 (patch)
tree525fff0e4393a41021550ebdad33e53197b0a4cf /src/merge.c
parent8063500c1458e71cc5530620681e5adfdda62fa5 (diff)
Make sure reflection contribution list gets freed
Diffstat (limited to 'src/merge.c')
-rw-r--r--src/merge.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/merge.c b/src/merge.c
index 3b850c30..9d36a359 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -3,11 +3,11 @@
*
* Parallel weighted merging of intensities
*
- * Copyright © 2012-2015 Deutsches Elektronen-Synchrotron DESY,
+ * Copyright © 2012-2018 Deutsches Elektronen-Synchrotron DESY,
* a research centre of the Helmholtz Association.
*
* Authors:
- * 2010-2015 Thomas White <taw@physics.org>
+ * 2010-2018 Thomas White <taw@physics.org>
*
* This file is part of CrystFEL.
*
@@ -46,6 +46,7 @@
#include "cell.h"
#include "utils.h"
#include "reflist.h"
+#include "reflist-utils.h"
#include "cell-utils.h"
@@ -319,6 +320,16 @@ RefList *merge_intensities(Crystal **crystals, int n, int n_threads,
get_indices(refl, &h, &k, &l);
r2 = add_refl(full2, h, k, l);
copy_data(r2, refl);
+
+ } else {
+
+ /* We do not need the contribution list any more */
+ struct reflection_contributions *c;
+ c = get_contributions(refl);
+ free(c->contribs);
+ free(c->contrib_crystals);
+ free(c);
+
}
}