Rename calibrate_detector to sum_stack, add new calibrate_detector

1 files changed, 34 insertions, 16 deletions

diff --git a/Makefile.in b/Makefile.in
index 89fe9a35..e1f68a5c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,7 +41,7 @@ bin_PROGRAMS = src/pattern_sim$(EXEEXT) src/process_hkl$(EXEEXT) \
 	src/render_hkl$(EXEEXT) src/calibrate_detector$(EXEEXT) \
 	src/partialator$(EXEEXT) src/reintegrate$(EXEEXT) \
 	src/estimate_background$(EXEEXT) src/check_hkl$(EXEEXT) \
-	$(am__EXEEXT_1) $(am__EXEEXT_2)
+	src/sum_stack$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2)
 noinst_PROGRAMS = tests/list_check$(EXEEXT)
 TESTS = tests/list_check$(EXEEXT)
 @HAVE_GTK_TRUE@am__append_1 = src/hdfsee
@@ -83,9 +83,8 @@ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am__dirstamp = $(am__leading_dot)dirstamp
 am_src_calibrate_detector_OBJECTS = src/calibrate_detector.$(OBJEXT) \
 	src/utils.$(OBJEXT) src/hdf5-file.$(OBJEXT) \
-	src/image.$(OBJEXT) src/filters.$(OBJEXT) src/peaks.$(OBJEXT) \
-	src/detector.$(OBJEXT) src/cell.$(OBJEXT) \
-	src/thread-pool.$(OBJEXT) src/reflist.$(OBJEXT)
+	src/image.$(OBJEXT) src/thread-pool.$(OBJEXT) \
+	src/detector.$(OBJEXT)
 src_calibrate_detector_OBJECTS = $(am_src_calibrate_detector_OBJECTS)
 src_calibrate_detector_LDADD = $(LDADD)
 src_calibrate_detector_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
@@ -224,6 +223,14 @@ am_src_render_hkl_OBJECTS = src/render_hkl.$(OBJEXT) \
 src_render_hkl_OBJECTS = $(am_src_render_hkl_OBJECTS)
 src_render_hkl_LDADD = $(LDADD)
 src_render_hkl_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
+am_src_sum_stack_OBJECTS = src/sum_stack.$(OBJEXT) src/utils.$(OBJEXT) \
+	src/hdf5-file.$(OBJEXT) src/image.$(OBJEXT) \
+	src/filters.$(OBJEXT) src/peaks.$(OBJEXT) \
+	src/detector.$(OBJEXT) src/cell.$(OBJEXT) \
+	src/thread-pool.$(OBJEXT) src/reflist.$(OBJEXT)
+src_sum_stack_OBJECTS = $(am_src_sum_stack_OBJECTS)
+src_sum_stack_LDADD = $(LDADD)
+src_sum_stack_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
 am_tests_list_check_OBJECTS = tests/list_check.$(OBJEXT) \
 	src/reflist.$(OBJEXT) src/thread-pool.$(OBJEXT) \
 	src/utils.$(OBJEXT)
@@ -257,7 +264,7 @@ SOURCES = $(src_calibrate_detector_SOURCES) $(src_check_hkl_SOURCES) \
 	$(src_partialator_SOURCES) $(src_pattern_sim_SOURCES) \
 	$(src_powder_plot_SOURCES) $(src_process_hkl_SOURCES) \
 	$(src_reintegrate_SOURCES) $(src_render_hkl_SOURCES) \
-	$(tests_list_check_SOURCES)
+	$(src_sum_stack_SOURCES) $(tests_list_check_SOURCES)
 DIST_SOURCES = $(src_calibrate_detector_SOURCES) \
 	$(src_check_hkl_SOURCES) $(src_compare_hkl_SOURCES) \
 	$(am__src_cubeit_SOURCES_DIST) \
@@ -266,7 +273,8 @@ DIST_SOURCES = $(src_calibrate_detector_SOURCES) \
 	$(am__src_indexamajig_SOURCES_DIST) $(src_partialator_SOURCES) \
 	$(am__src_pattern_sim_SOURCES_DIST) $(src_powder_plot_SOURCES) \
 	$(src_process_hkl_SOURCES) $(src_reintegrate_SOURCES) \
-	$(src_render_hkl_SOURCES) $(tests_list_check_SOURCES)
+	$(src_render_hkl_SOURCES) $(src_sum_stack_SOURCES) \
+	$(tests_list_check_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -614,10 +622,13 @@ src_render_hkl_SOURCES = src/render_hkl.c src/cell.c src/reflections.c \
                          src/hdf5-file.c src/image.c src/filters.c \
                          src/thread-pool.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 \
+                        src/cell.c src/thread-pool.c src/reflist.c
+
 src_calibrate_detector_SOURCES = src/calibrate_detector.c src/utils.c \
-                                 src/hdf5-file.c src/image.c src/filters.c \
-                                 src/peaks.c src/detector.c src/cell.c \
-                                 src/thread-pool.c src/reflist.c
+                                 src/hdf5-file.c src/image.c src/thread-pool.c \
+                                 src/detector.c
 
 src_partialator_SOURCES = src/partialator.c src/cell.c src/hdf5-file.c \
                           src/utils.c src/detector.c src/peaks.c src/image.c \
@@ -782,15 +793,9 @@ src/utils.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/hdf5-file.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/image.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/filters.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/peaks.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/detector.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/cell.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/thread-pool.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
-src/reflist.$(OBJEXT): src/$(am__dirstamp) \
+src/detector.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/calibrate_detector$(EXEEXT): $(src_calibrate_detector_OBJECTS) $(src_calibrate_detector_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/calibrate_detector$(EXEEXT)
@@ -798,6 +803,7 @@ src/calibrate_detector$(EXEEXT): $(src_calibrate_detector_OBJECTS) $(src_calibra
 src/check_hkl.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/sfac.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/cell.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/reflections.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/statistics.$(OBJEXT): src/$(am__dirstamp) \
@@ -816,6 +822,8 @@ src/cubeit.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/render.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/filters.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/stream.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/cubeit$(EXEEXT): $(src_cubeit_OBJECTS) $(src_cubeit_DEPENDENCIES) src/$(am__dirstamp)
@@ -842,6 +850,7 @@ src/hdfsee$(EXEEXT): $(src_hdfsee_OBJECTS) $(src_hdfsee_DEPENDENCIES) src/$(am__
 	$(AM_V_CCLD)$(LINK) $(src_hdfsee_OBJECTS) $(src_hdfsee_LDADD) $(LIBS)
 src/indexamajig.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/peaks.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/index.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/diffraction.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
@@ -852,6 +861,8 @@ src/templates.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/geometry.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/reflist.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/diffraction-gpu.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/cl-utils.$(OBJEXT): src/$(am__dirstamp) \
@@ -895,6 +906,11 @@ src/povray.$(OBJEXT): src/$(am__dirstamp) \
 src/render_hkl$(EXEEXT): $(src_render_hkl_OBJECTS) $(src_render_hkl_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/render_hkl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_render_hkl_OBJECTS) $(src_render_hkl_LDADD) $(LIBS)
+src/sum_stack.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/sum_stack$(EXEEXT): $(src_sum_stack_OBJECTS) $(src_sum_stack_DEPENDENCIES) src/$(am__dirstamp)
+	@rm -f src/sum_stack$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(src_sum_stack_OBJECTS) $(src_sum_stack_LDADD) $(LIBS)
 tests/$(am__dirstamp):
 	@$(MKDIR_P) tests
 	@: > tests/$(am__dirstamp)
@@ -947,6 +963,7 @@ mostlyclean-compile:
 	-rm -f src/sfac.$(OBJEXT)
 	-rm -f src/statistics.$(OBJEXT)
 	-rm -f src/stream.$(OBJEXT)
+	-rm -f src/sum_stack.$(OBJEXT)
 	-rm -f src/symmetry.$(OBJEXT)
 	-rm -f src/templates.$(OBJEXT)
 	-rm -f src/thread-pool.$(OBJEXT)
@@ -994,6 +1011,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/sfac.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/statistics.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/stream.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/sum_stack.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/symmetry.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/templates.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/thread-pool.Po@am__quote@