From abb1edf5301c36a814e65b9851c0848e35f82173 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Tue, 29 Mar 2011 11:34:07 +0200
Subject: Reject peaks from the HDF5 list in panels marked with no_index

---
 Makefile.am     | 2 +-
 Makefile.in     | 4 ++--
 src/hdf5-file.c | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 54d885b1..50d98324 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,7 +85,7 @@ src_powder_plot_SOURCES = src/powder_plot.c src/cell.c src/utils.c src/image.c \
 src_render_hkl_SOURCES = src/render_hkl.c src/cell.c src/reflist-utils.c \
                          src/utils.c src/povray.c src/symmetry.c src/render.c \
                          src/hdf5-file.c src/image.c src/filters.c \
-                         src/thread-pool.c src/reflist.c
+                         src/thread-pool.c src/reflist.c src/detector.c
 
 src_sum_stack_SOURCES = src/sum_stack.c src/utils.c src/hdf5-file.c \
                         src/image.c src/filters.c src/peaks.c src/detector.c \
diff --git a/Makefile.in b/Makefile.in
index b6554a7b..71dad4e0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -209,7 +209,7 @@ am_src_render_hkl_OBJECTS = src/render_hkl.$(OBJEXT) \
 	src/symmetry.$(OBJEXT) src/render.$(OBJEXT) \
 	src/hdf5-file.$(OBJEXT) src/image.$(OBJEXT) \
 	src/filters.$(OBJEXT) src/thread-pool.$(OBJEXT) \
-	src/reflist.$(OBJEXT)
+	src/reflist.$(OBJEXT) src/detector.$(OBJEXT)
 src_render_hkl_OBJECTS = $(am_src_render_hkl_OBJECTS)
 src_render_hkl_LDADD = $(LDADD)
 src_render_hkl_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
@@ -637,7 +637,7 @@ src_powder_plot_SOURCES = src/powder_plot.c src/cell.c src/utils.c src/image.c \
 src_render_hkl_SOURCES = src/render_hkl.c src/cell.c src/reflist-utils.c \
                          src/utils.c src/povray.c src/symmetry.c src/render.c \
                          src/hdf5-file.c src/image.c src/filters.c \
-                         src/thread-pool.c src/reflist.c
+                         src/thread-pool.c src/reflist.c src/detector.c
 
 src_sum_stack_SOURCES = src/sum_stack.c src/utils.c src/hdf5-file.c \
                         src/image.c src/filters.c src/peaks.c src/detector.c \
diff --git a/src/hdf5-file.c b/src/hdf5-file.c
index 2979926f..be0b5444 100644
--- a/src/hdf5-file.c
+++ b/src/hdf5-file.c
@@ -153,11 +153,16 @@ int get_peaks(struct image *image, struct hdfile *f)
 	for ( i=0; i<size[0]; i++ ) {
 
 		float fs, ss, val;
+		struct panel *p;
 
 		fs = buf[3*i+0];
 		ss = buf[3*i+1];
 		val = buf[3*i+2];
 
+		p = find_panel(image->det, fs, ss);
+		if ( p == NULL ) continue;
+		if ( p->no_index ) continue;
+
 		image_add_feature(image->features, fs, ss, image, val, NULL);
 
 	}
-- 
cgit v1.2.3