Remove old reflections.h

1 files changed, 36 insertions, 40 deletions

diff --git a/Makefile.in b/Makefile.in
index f8d4bf23..226389f9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -90,16 +90,17 @@ src_calibrate_detector_OBJECTS = $(am_src_calibrate_detector_OBJECTS)
 src_calibrate_detector_LDADD = $(LDADD)
 src_calibrate_detector_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
 am_src_check_hkl_OBJECTS = src/check_hkl.$(OBJEXT) src/cell.$(OBJEXT) \
-	src/utils.$(OBJEXT) src/reflections.$(OBJEXT) \
+	src/utils.$(OBJEXT) src/reflist-utils.$(OBJEXT) \
 	src/statistics.$(OBJEXT) src/symmetry.$(OBJEXT) \
-	src/thread-pool.$(OBJEXT)
+	src/thread-pool.$(OBJEXT) src/reflist.$(OBJEXT)
 src_check_hkl_OBJECTS = $(am_src_check_hkl_OBJECTS)
 src_check_hkl_LDADD = $(LDADD)
 src_check_hkl_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
 am_src_compare_hkl_OBJECTS = src/compare_hkl.$(OBJEXT) \
 	src/cell.$(OBJEXT) src/utils.$(OBJEXT) \
-	src/reflections.$(OBJEXT) src/statistics.$(OBJEXT) \
-	src/symmetry.$(OBJEXT) src/thread-pool.$(OBJEXT)
+	src/reflist-utils.$(OBJEXT) src/statistics.$(OBJEXT) \
+	src/symmetry.$(OBJEXT) src/thread-pool.$(OBJEXT) \
+	src/reflist.$(OBJEXT)
 src_compare_hkl_OBJECTS = $(am_src_compare_hkl_OBJECTS)
 src_compare_hkl_LDADD = $(LDADD)
 src_compare_hkl_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
@@ -120,9 +121,9 @@ src_cubeit_OBJECTS = $(am_src_cubeit_OBJECTS)
 src_cubeit_LDADD = $(LDADD)
 src_cubeit_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
 am_src_get_hkl_OBJECTS = src/get_hkl.$(OBJEXT) src/cell.$(OBJEXT) \
-	src/utils.$(OBJEXT) src/reflections.$(OBJEXT) \
+	src/utils.$(OBJEXT) src/reflist-utils.$(OBJEXT) \
 	src/symmetry.$(OBJEXT) src/beam-parameters.$(OBJEXT) \
-	src/thread-pool.$(OBJEXT)
+	src/thread-pool.$(OBJEXT) src/reflist.$(OBJEXT)
 src_get_hkl_OBJECTS = $(am_src_get_hkl_OBJECTS)
 src_get_hkl_LDADD = $(LDADD)
 src_get_hkl_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
@@ -142,10 +143,9 @@ src_hdfsee_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
 am__src_indexamajig_SOURCES_DIST = src/indexamajig.c src/hdf5-file.c \
 	src/utils.c src/cell.c src/image.c src/peaks.c src/index.c \
 	src/filters.c src/diffraction.c src/detector.c src/dirax.c \
-	src/mosflm.c src/reflections.c src/symmetry.c src/geometry.c \
+	src/mosflm.c src/reflist-utils.c src/symmetry.c src/geometry.c \
 	src/thread-pool.c src/beam-parameters.c src/reflist.c \
-	src/stream.c src/reflist-utils.c src/diffraction-gpu.c \
-	src/cl-utils.c
+	src/stream.c src/diffraction-gpu.c src/cl-utils.c
 @HAVE_OPENCL_TRUE@am__objects_1 = src/diffraction-gpu.$(OBJEXT) \
 @HAVE_OPENCL_TRUE@	src/cl-utils.$(OBJEXT)
 am_src_indexamajig_OBJECTS = src/indexamajig.$(OBJEXT) \
@@ -153,35 +153,34 @@ am_src_indexamajig_OBJECTS = src/indexamajig.$(OBJEXT) \
 	src/image.$(OBJEXT) src/peaks.$(OBJEXT) src/index.$(OBJEXT) \
 	src/filters.$(OBJEXT) src/diffraction.$(OBJEXT) \
 	src/detector.$(OBJEXT) src/dirax.$(OBJEXT) \
-	src/mosflm.$(OBJEXT) src/reflections.$(OBJEXT) \
+	src/mosflm.$(OBJEXT) src/reflist-utils.$(OBJEXT) \
 	src/symmetry.$(OBJEXT) src/geometry.$(OBJEXT) \
 	src/thread-pool.$(OBJEXT) src/beam-parameters.$(OBJEXT) \
-	src/reflist.$(OBJEXT) src/stream.$(OBJEXT) \
-	src/reflist-utils.$(OBJEXT) $(am__objects_1)
+	src/reflist.$(OBJEXT) src/stream.$(OBJEXT) $(am__objects_1)
 src_indexamajig_OBJECTS = $(am_src_indexamajig_OBJECTS)
 src_indexamajig_LDADD = $(LDADD)
 src_indexamajig_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
 am_src_partialator_OBJECTS = src/partialator.$(OBJEXT) \
 	src/cell.$(OBJEXT) src/hdf5-file.$(OBJEXT) src/utils.$(OBJEXT) \
 	src/detector.$(OBJEXT) src/peaks.$(OBJEXT) src/image.$(OBJEXT) \
-	src/geometry.$(OBJEXT) src/reflections.$(OBJEXT) \
+	src/geometry.$(OBJEXT) src/reflist-utils.$(OBJEXT) \
 	src/stream.$(OBJEXT) src/thread-pool.$(OBJEXT) \
 	src/beam-parameters.$(OBJEXT) src/symmetry.$(OBJEXT) \
 	src/post-refinement.$(OBJEXT) src/hrs-scaling.$(OBJEXT) \
-	src/reflist.$(OBJEXT) src/reflist-utils.$(OBJEXT)
+	src/reflist.$(OBJEXT)
 src_partialator_OBJECTS = $(am_src_partialator_OBJECTS)
 src_partialator_LDADD = $(LDADD)
 src_partialator_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
 am__src_pattern_sim_SOURCES_DIST = src/pattern_sim.c src/diffraction.c \
 	src/utils.c src/image.c src/cell.c src/hdf5-file.c \
-	src/detector.c src/peaks.c src/reflections.c \
+	src/detector.c src/peaks.c src/reflist-utils.c \
 	src/beam-parameters.c src/symmetry.c src/thread-pool.c \
 	src/reflist.c src/diffraction-gpu.c src/cl-utils.c
 am_src_pattern_sim_OBJECTS = src/pattern_sim.$(OBJEXT) \
 	src/diffraction.$(OBJEXT) src/utils.$(OBJEXT) \
 	src/image.$(OBJEXT) src/cell.$(OBJEXT) src/hdf5-file.$(OBJEXT) \
 	src/detector.$(OBJEXT) src/peaks.$(OBJEXT) \
-	src/reflections.$(OBJEXT) src/beam-parameters.$(OBJEXT) \
+	src/reflist-utils.$(OBJEXT) src/beam-parameters.$(OBJEXT) \
 	src/symmetry.$(OBJEXT) src/thread-pool.$(OBJEXT) \
 	src/reflist.$(OBJEXT) $(am__objects_1)
 src_pattern_sim_OBJECTS = $(am_src_pattern_sim_OBJECTS)
@@ -205,11 +204,12 @@ src_process_hkl_OBJECTS = $(am_src_process_hkl_OBJECTS)
 src_process_hkl_LDADD = $(LDADD)
 src_process_hkl_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
 am_src_render_hkl_OBJECTS = src/render_hkl.$(OBJEXT) \
-	src/cell.$(OBJEXT) src/reflections.$(OBJEXT) \
+	src/cell.$(OBJEXT) src/reflist-utils.$(OBJEXT) \
 	src/utils.$(OBJEXT) src/povray.$(OBJEXT) \
 	src/symmetry.$(OBJEXT) src/render.$(OBJEXT) \
 	src/hdf5-file.$(OBJEXT) src/image.$(OBJEXT) \
-	src/filters.$(OBJEXT) src/thread-pool.$(OBJEXT)
+	src/filters.$(OBJEXT) src/thread-pool.$(OBJEXT) \
+	src/reflist.$(OBJEXT)
 src_render_hkl_OBJECTS = $(am_src_render_hkl_OBJECTS)
 src_render_hkl_LDADD = $(LDADD)
 src_render_hkl_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
@@ -558,7 +558,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = configure m4/gnulib-cache.m4 src/cell.h src/hdf5-file.h \
 	src/image.h src/utils.h src/diffraction.h src/detector.h \
-	src/reflections.h src/list_tmp.h src/statistics.h \
+	src/reflist-utils.h src/list_tmp.h src/statistics.h \
 	src/dw-hdfsee.h src/render.h src/hdfsee.h src/dirax.h \
 	src/mosflm.h src/peaks.h src/index.h src/filters.h \
 	src/diffraction-gpu.h src/cl-utils.h src/symmetry.h \
@@ -588,7 +588,7 @@ AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" -I$(top_builddir)/lib -I$(top_srcdir)/l
 LDADD = $(top_builddir)/lib/libgnu.a @IGNORE_UNUSED_LIBRARIES_CFLAGS@
 src_pattern_sim_SOURCES = src/pattern_sim.c src/diffraction.c \
 	src/utils.c src/image.c src/cell.c src/hdf5-file.c \
-	src/detector.c src/peaks.c src/reflections.c \
+	src/detector.c src/peaks.c src/reflist-utils.c \
 	src/beam-parameters.c src/symmetry.c src/thread-pool.c \
 	src/reflist.c $(am__append_3)
 @HAVE_OPENCL_TRUE@tests_gpu_sim_check_SOURCES = tests/gpu_sim_check.c src/utils.c \
@@ -606,33 +606,33 @@ src_process_hkl_SOURCES = src/process_hkl.c src/statistics.c \
 src_indexamajig_SOURCES = src/indexamajig.c src/hdf5-file.c \
 	src/utils.c src/cell.c src/image.c src/peaks.c src/index.c \
 	src/filters.c src/diffraction.c src/detector.c src/dirax.c \
-	src/mosflm.c src/reflections.c src/symmetry.c src/geometry.c \
+	src/mosflm.c src/reflist-utils.c src/symmetry.c src/geometry.c \
 	src/thread-pool.c src/beam-parameters.c src/reflist.c \
-	src/stream.c src/reflist-utils.c $(am__append_6)
+	src/stream.c $(am__append_6)
 @BUILD_HDFSEE_TRUE@src_hdfsee_SOURCES = src/hdfsee.c src/dw-hdfsee.c src/render.c \
 @BUILD_HDFSEE_TRUE@                     src/hdf5-file.c src/utils.c src/image.c src/filters.c \
 @BUILD_HDFSEE_TRUE@                     src/thread-pool.c src/detector.c
 
 src_get_hkl_SOURCES = src/get_hkl.c src/cell.c src/utils.c \
-                      src/reflections.c src/symmetry.c src/beam-parameters.c \
-                      src/thread-pool.c
+                      src/reflist-utils.c src/symmetry.c src/beam-parameters.c \
+                      src/thread-pool.c src/reflist.c
 
 src_compare_hkl_SOURCES = src/compare_hkl.c src/cell.c src/utils.c \
-                          src/reflections.c src/statistics.c src/symmetry.c \
-                          src/thread-pool.c
+                          src/reflist-utils.c src/statistics.c src/symmetry.c \
+                          src/thread-pool.c src/reflist.c
 
 src_check_hkl_SOURCES = src/check_hkl.c src/cell.c src/utils.c \
-                        src/reflections.c src/statistics.c src/symmetry.c \
-                        src/thread-pool.c
+                        src/reflist-utils.c src/statistics.c src/symmetry.c \
+                        src/thread-pool.c src/reflist.c
 
 src_powder_plot_SOURCES = src/powder_plot.c src/cell.c src/utils.c src/image.c \
                           src/hdf5-file.c src/detector.c src/thread-pool.c \
                           src/beam-parameters.c
 
-src_render_hkl_SOURCES = src/render_hkl.c src/cell.c src/reflections.c \
-                         src/utils.c  src/povray.c src/symmetry.c src/render.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/thread-pool.c src/reflist.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 \
@@ -644,10 +644,10 @@ src_calibrate_detector_SOURCES = src/calibrate_detector.c src/utils.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 \
-                          src/geometry.c src/reflections.c src/stream.c \
+                          src/geometry.c src/reflist-utils.c src/stream.c \
                           src/thread-pool.c src/beam-parameters.c \
                           src/symmetry.c src/post-refinement.c \
-                          src/hrs-scaling.c src/reflist.c src/reflist-utils.c
+                          src/hrs-scaling.c src/reflist.c
 
 @BUILD_CUBEIT_TRUE@src_cubeit_SOURCES = src/cubeit.c src/cell.c src/hdf5-file.c src/utils.c \
 @BUILD_CUBEIT_TRUE@                     src/detector.c src/render.c src/filters.c src/image.c \
@@ -803,12 +803,14 @@ src/calibrate_detector$(EXEEXT): $(src_calibrate_detector_OBJECTS) $(src_calibra
 src/check_hkl.$(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/reflist-utils.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/statistics.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/symmetry.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/reflist.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/check_hkl$(EXEEXT): $(src_check_hkl_OBJECTS) $(src_check_hkl_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/check_hkl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_check_hkl_OBJECTS) $(src_check_hkl_LDADD) $(LIBS)
@@ -825,10 +827,6 @@ src/filters.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/stream.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
-src/reflist.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/reflist-utils.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
 src/cubeit$(EXEEXT): $(src_cubeit_OBJECTS) $(src_cubeit_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/cubeit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_cubeit_OBJECTS) $(src_cubeit_LDADD) $(LIBS)
@@ -948,7 +946,6 @@ mostlyclean-compile:
 	-rm -f src/povray.$(OBJEXT)
 	-rm -f src/powder_plot.$(OBJEXT)
 	-rm -f src/process_hkl.$(OBJEXT)
-	-rm -f src/reflections.$(OBJEXT)
 	-rm -f src/reflist-utils.$(OBJEXT)
 	-rm -f src/reflist.$(OBJEXT)
 	-rm -f src/render.$(OBJEXT)
@@ -994,7 +991,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/povray.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/powder_plot.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/process_hkl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/reflections.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/reflist-utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/reflist.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/render.Po@am__quote@