WIP on new stream format in process_hkl

1 files changed, 25 insertions, 18 deletions

diff --git a/Makefile.in b/Makefile.in
index b65b60a3..402094df 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -107,7 +107,7 @@ src_compare_hkl_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
 am__src_cubeit_SOURCES_DIST = src/cubeit.c src/cell.c src/hdf5-file.c \
 	src/utils.c src/detector.c src/render.c src/filters.c \
 	src/image.c src/symmetry.c src/stream.c src/thread-pool.c \
-	src/reflist.c
+	src/reflist.c src/reflist-utils.c
 @BUILD_CUBEIT_TRUE@am_src_cubeit_OBJECTS = src/cubeit.$(OBJEXT) \
 @BUILD_CUBEIT_TRUE@	src/cell.$(OBJEXT) src/hdf5-file.$(OBJEXT) \
 @BUILD_CUBEIT_TRUE@	src/utils.$(OBJEXT) src/detector.$(OBJEXT) \
@@ -115,7 +115,8 @@ am__src_cubeit_SOURCES_DIST = src/cubeit.c src/cell.c src/hdf5-file.c \
 @BUILD_CUBEIT_TRUE@	src/image.$(OBJEXT) src/symmetry.$(OBJEXT) \
 @BUILD_CUBEIT_TRUE@	src/stream.$(OBJEXT) \
 @BUILD_CUBEIT_TRUE@	src/thread-pool.$(OBJEXT) \
-@BUILD_CUBEIT_TRUE@	src/reflist.$(OBJEXT)
+@BUILD_CUBEIT_TRUE@	src/reflist.$(OBJEXT) \
+@BUILD_CUBEIT_TRUE@	src/reflist-utils.$(OBJEXT)
 src_cubeit_OBJECTS = $(am_src_cubeit_OBJECTS)
 src_cubeit_LDADD = $(LDADD)
 src_cubeit_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
@@ -124,7 +125,7 @@ am_src_estimate_background_OBJECTS =  \
 	src/utils.$(OBJEXT) src/cell.$(OBJEXT) \
 	src/thread-pool.$(OBJEXT) src/image.$(OBJEXT) \
 	src/detector.$(OBJEXT) src/hdf5-file.$(OBJEXT) \
-	src/reflist.$(OBJEXT)
+	src/reflist.$(OBJEXT) src/reflist-utils.$(OBJEXT)
 src_estimate_background_OBJECTS =  \
 	$(am_src_estimate_background_OBJECTS)
 src_estimate_background_LDADD = $(LDADD)
@@ -154,8 +155,8 @@ am__src_indexamajig_SOURCES_DIST = src/indexamajig.c src/hdf5-file.c \
 	src/filters.c src/diffraction.c src/detector.c src/sfac.c \
 	src/dirax.c src/mosflm.c src/reflections.c src/symmetry.c \
 	src/geometry.c src/thread-pool.c src/beam-parameters.c \
-	src/reflist.c src/stream.c src/diffraction-gpu.c \
-	src/cl-utils.c
+	src/reflist.c src/stream.c src/reflist-utils.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) \
@@ -166,7 +167,8 @@ am_src_indexamajig_OBJECTS = src/indexamajig.$(OBJEXT) \
 	src/mosflm.$(OBJEXT) src/reflections.$(OBJEXT) \
 	src/symmetry.$(OBJEXT) src/geometry.$(OBJEXT) \
 	src/thread-pool.$(OBJEXT) src/beam-parameters.$(OBJEXT) \
-	src/reflist.$(OBJEXT) src/stream.$(OBJEXT) $(am__objects_1)
+	src/reflist.$(OBJEXT) src/stream.$(OBJEXT) \
+	src/reflist-utils.$(OBJEXT) $(am__objects_1)
 src_indexamajig_OBJECTS = $(am_src_indexamajig_OBJECTS)
 src_indexamajig_LDADD = $(LDADD)
 src_indexamajig_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
@@ -177,7 +179,7 @@ am_src_partialator_OBJECTS = src/partialator.$(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.$(OBJEXT) src/reflist-utils.$(OBJEXT)
 src_partialator_OBJECTS = $(am_src_partialator_OBJECTS)
 src_partialator_LDADD = $(LDADD)
 src_partialator_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
@@ -205,11 +207,11 @@ src_powder_plot_LDADD = $(LDADD)
 src_powder_plot_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
 am_src_process_hkl_OBJECTS = src/process_hkl.$(OBJEXT) \
 	src/sfac.$(OBJEXT) src/statistics.$(OBJEXT) src/cell.$(OBJEXT) \
-	src/utils.$(OBJEXT) src/reflections.$(OBJEXT) \
-	src/symmetry.$(OBJEXT) src/stream.$(OBJEXT) \
-	src/beam-parameters.$(OBJEXT) src/thread-pool.$(OBJEXT) \
-	src/image.$(OBJEXT) src/detector.$(OBJEXT) \
-	src/hdf5-file.$(OBJEXT) src/reflist.$(OBJEXT)
+	src/utils.$(OBJEXT) src/symmetry.$(OBJEXT) \
+	src/stream.$(OBJEXT) src/beam-parameters.$(OBJEXT) \
+	src/thread-pool.$(OBJEXT) src/image.$(OBJEXT) \
+	src/detector.$(OBJEXT) src/hdf5-file.$(OBJEXT) \
+	src/reflist.$(OBJEXT) src/reflist-utils.$(OBJEXT)
 src_process_hkl_OBJECTS = $(am_src_process_hkl_OBJECTS)
 src_process_hkl_LDADD = $(LDADD)
 src_process_hkl_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
@@ -612,17 +614,17 @@ src_pattern_sim_SOURCES = src/pattern_sim.c src/diffraction.c \
 @HAVE_OPENCL_TRUE@                              src/image.c
 
 src_process_hkl_SOURCES = src/process_hkl.c src/sfac.c src/statistics.c \
-                          src/cell.c src/utils.c src/reflections.c \
+                          src/cell.c src/utils.c \
                           src/symmetry.c src/stream.c src/beam-parameters.c \
                           src/thread-pool.c src/image.c src/detector.c \
-                          src/hdf5-file.c src/reflist.c
+                          src/hdf5-file.c src/reflist.c src/reflist-utils.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/sfac.c \
 	src/dirax.c src/mosflm.c src/reflections.c src/symmetry.c \
 	src/geometry.c src/thread-pool.c src/beam-parameters.c \
-	src/reflist.c src/stream.c $(am__append_6)
+	src/reflist.c src/stream.c src/reflist-utils.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
@@ -661,16 +663,17 @@ src_partialator_SOURCES = src/partialator.c src/cell.c src/hdf5-file.c \
                           src/geometry.c src/reflections.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/hrs-scaling.c src/reflist.c src/reflist-utils.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 \
-@BUILD_CUBEIT_TRUE@                     src/symmetry.c src/stream.c src/thread-pool.c src/reflist.c
+@BUILD_CUBEIT_TRUE@                     src/symmetry.c src/stream.c src/thread-pool.c \
+@BUILD_CUBEIT_TRUE@                     src/reflist.c src/reflist-utils.c
 
 src_estimate_background_SOURCES = src/estimate_background.c src/stream.c \
                                   src/utils.c src/cell.c src/thread-pool.c \
                                   src/image.c src/detector.c src/hdf5-file.c \
-                                  src/reflist.c
+                                  src/reflist.c src/reflist-utils.c
 
 tests_list_check_SOURCES = tests/list_check.c src/reflist.c src/thread-pool.c \
                            src/utils.c
@@ -851,6 +854,8 @@ 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)
@@ -977,6 +982,7 @@ mostlyclean-compile:
 	-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)
 	-rm -f src/render_hkl.$(OBJEXT)
@@ -1024,6 +1030,7 @@ distclean-compile:
 @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@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/render_hkl.Po@am__quote@