From 7b65c4e12698c8c7dedd55b0e0038421ed4db094 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Fri, 29 Oct 2010 17:11:20 +0200
Subject: facetron: Use symmetry when merging

---
 src/Makefile.am |  2 +-
 src/Makefile.in |  4 ++--
 src/facetron.c  | 11 +++++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index e2062d15..dc048526 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,7 +60,7 @@ calibrate_detector_LDADD = @LIBS@
 
 facetron_SOURCES = facetron.c cell.c hdf5-file.c utils.c detector.c peaks.c \
                    image.c geometry.c reflections.c stream.c thread-pool.c \
-                   beam-parameters.c
+                   beam-parameters.c symmetry.c
 facetron_LDADD = @LIBS@
 
 cubeit_SOURCES = cubeit.c cell.c hdf5-file.c utils.c detector.c render.c \
diff --git a/src/Makefile.in b/src/Makefile.in
index 54dff463..5805bef2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -79,7 +79,7 @@ am_facetron_OBJECTS = facetron.$(OBJEXT) cell.$(OBJEXT) \
 	hdf5-file.$(OBJEXT) utils.$(OBJEXT) detector.$(OBJEXT) \
 	peaks.$(OBJEXT) image.$(OBJEXT) geometry.$(OBJEXT) \
 	reflections.$(OBJEXT) stream.$(OBJEXT) thread-pool.$(OBJEXT) \
-	beam-parameters.$(OBJEXT)
+	beam-parameters.$(OBJEXT) symmetry.$(OBJEXT)
 facetron_OBJECTS = $(am_facetron_OBJECTS)
 facetron_DEPENDENCIES =
 am_get_hkl_OBJECTS = get_hkl.$(OBJEXT) sfac.$(OBJEXT) cell.$(OBJEXT) \
@@ -313,7 +313,7 @@ calibrate_detector_SOURCES = calibrate_detector.c utils.c hdf5-file.c image.c \
 calibrate_detector_LDADD = @LIBS@
 facetron_SOURCES = facetron.c cell.c hdf5-file.c utils.c detector.c peaks.c \
                    image.c geometry.c reflections.c stream.c thread-pool.c \
-                   beam-parameters.c
+                   beam-parameters.c symmetry.c
 
 facetron_LDADD = @LIBS@
 cubeit_SOURCES = cubeit.c cell.c hdf5-file.c utils.c detector.c render.c \
diff --git a/src/facetron.c b/src/facetron.c
index 806ce54f..c4470411 100644
--- a/src/facetron.c
+++ b/src/facetron.c
@@ -121,6 +121,7 @@ static void integrate_image(int mytask, void *tasks)
 	for ( j=0; j<n; j++ ) {
 
 		signed int h, k, l;
+		signed int ha, ka, la;
 		float i_partial;
 		float xc, yc;
 		float i_full_est;
@@ -143,11 +144,13 @@ static void integrate_image(int mytask, void *tasks)
 
 		i_full_est = i_partial * spots[j].p;
 
+		get_asymm(h, k, l, &ha, &ka, &la, pargs->sym);
+
 		pthread_mutex_lock(pargs->list_lock);
-		integrate_intensity(pargs->i_full, h, k, l, i_full_est);
-		integrate_count(pargs->cts, h, k, l, 1);
-		if ( !find_item(pargs->obs, h, k, l) ) {
-			add_item(pargs->obs, h, k, l);
+		integrate_intensity(pargs->i_full, ha, ka, la, i_full_est);
+		integrate_count(pargs->cts, ha, ka, la, 1);
+		if ( !find_item(pargs->obs, ha, ka, la) ) {
+			add_item(pargs->obs, ha, ka, la);
 		}
 		pthread_mutex_unlock(pargs->list_lock);
 
-- 
cgit v1.2.3