aboutsummaryrefslogtreecommitdiff
path: root/src/reintegrate.c
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2011-02-11 12:37:03 -0800
committerThomas White <taw@physics.org>2012-02-22 15:27:14 +0100
commitaab9901f18326214746402650179a13f22770118 (patch)
tree445663c658cd5a1cb58304145c3878ce31126a0a /src/reintegrate.c
parent91ffa38ff55e08ed7faf60b2e6b1c8ba27e89f5c (diff)
Make find_projected_peaks() behave like find_intersections()
Also make sure output_intensities() deals only with integration
Diffstat (limited to 'src/reintegrate.c')
-rw-r--r--src/reintegrate.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/reintegrate.c b/src/reintegrate.c
index a3ee85c9..8450eaab 100644
--- a/src/reintegrate.c
+++ b/src/reintegrate.c
@@ -110,7 +110,6 @@ static void process_image(void *pg, int cookie)
image.flags = NULL;
image.indexed_cell = NULL;
image.filename = apargs->filename;
- image.reflections = NULL;
image.det = pargs->det;
STATUS("Processing '%s'\n", apargs->filename);
@@ -137,9 +136,18 @@ static void process_image(void *pg, int cookie)
} else {
- output_intensities(&image, apargs->cell,
- pargs->output_mutex, pargs->config_polar,
- pargs->config_closer, pargs->ofh, 0, 0.1);
+ RefList *reflections;
+
+ reflections = find_projected_peaks(&image, image.indexed_cell,
+ 0, 0.1);
+
+ output_intensities(&image, image.indexed_cell, reflections,
+ pargs->output_mutex,
+ pargs->config_polar,
+ pargs->config_closer,
+ pargs->ofh);
+
+ reflist_free(reflections);
}
free(image.data);