aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.in2
-rwxr-xr-xtests/fourth_merge_check28
-rw-r--r--tests/fourth_merge_check.hkl3
4 files changed, 33 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 7a92e16e..d91d3ec0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = src/pattern_sim src/process_hkl src/get_hkl src/indexamajig \
noinst_PROGRAMS = tests/list_check
TESTS = tests/list_check tests/first_merge_check tests/second_merge_check \
- tests/third_merge_check
+ tests/third_merge_check tests/fourth_merge_check
if BUILD_HDFSEE
bin_PROGRAMS += src/hdfsee
diff --git a/Makefile.in b/Makefile.in
index f50b3624..e1a30362 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,7 +44,7 @@ bin_PROGRAMS = src/pattern_sim$(EXEEXT) src/process_hkl$(EXEEXT) \
noinst_PROGRAMS = tests/list_check$(EXEEXT) $(am__EXEEXT_3)
TESTS = tests/list_check$(EXEEXT) tests/first_merge_check \
tests/second_merge_check tests/third_merge_check \
- $(am__EXEEXT_3)
+ tests/fourth_merge_check $(am__EXEEXT_3)
@BUILD_HDFSEE_TRUE@am__append_1 = src/hdfsee
@BUILD_CUBEIT_TRUE@am__append_2 = src/cubeit
@HAVE_OPENCL_TRUE@am__append_3 = src/diffraction-gpu.c src/cl-utils.c
diff --git a/tests/fourth_merge_check b/tests/fourth_merge_check
new file mode 100755
index 00000000..6e845657
--- /dev/null
+++ b/tests/fourth_merge_check
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+cat > fourth_merge_check.stream << EOF
+CrystFEL stream format 2.0
+Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn
+----- Begin chunk -----
+Image filename: dummy.h5
+No unit cell from indexing.
+Cell parameters 27.74398 27.84377 16.90346 nm, 88.53688 91.11774 118.75944 deg
+astar = -0.0283891 +0.0149254 -0.0257273 nm^-1
+bstar = -0.0068281 +0.0403989 -0.0005196 nm^-1
+cstar = +0.0406926 +0.0052233 -0.0426520 nm^-1
+I0 = 1.0 (arbitrary units)
+photon_energy_eV = 2000.0
+Reflections measured after indexing
+ h k l I phase sigma(I) 1/d(nm^-1) counts fs/px ss/px
+ 1 0 0 100.00 - 0.00 1.0 1 938.0 629.0
+End of reflections
+----- End chunk -----
+EOF
+
+src/process_hkl -i fourth_merge_check.stream -o fourth_merge_check.hkl
+diff fourth_merge_check.hkl tests/fourth_merge_check.hkl
+if [ $? -ne 0 ]; then
+ exit 1
+fi
+rm -f fourth_merge_check.stream fourth_merge_check.hkl
+exit 0
diff --git a/tests/fourth_merge_check.hkl b/tests/fourth_merge_check.hkl
new file mode 100644
index 00000000..5b5a5a18
--- /dev/null
+++ b/tests/fourth_merge_check.hkl
@@ -0,0 +1,3 @@
+ h k l I phase sigma(I) 1/d(nm^-1) counts fs/px ss/px
+ 1 0 0 100.00 - 0.00 - 1 0.0 0.0
+End of reflections