aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2011-03-29 11:34:07 +0200
committerThomas White <taw@physics.org>2012-02-22 15:27:22 +0100
commitabb1edf5301c36a814e65b9851c0848e35f82173 (patch)
treeb7da645e6dbb5d8f83f04a12fdc04ca02c3cbda4
parent1c13a85b311f7029f87413b4472412546eabd3af (diff)
Reject peaks from the HDF5 list in panels marked with no_index
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.in4
-rw-r--r--src/hdf5-file.c5
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);
}