diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rwxr-xr-x | tests/first_merge_check | 43 | ||||
| -rw-r--r-- | tests/first_merge_check.hkl | 3 | ||||
| -rwxr-xr-x | tests/second_merge_check | 43 | ||||
| -rwxr-xr-x | tests/third_merge_check | 58 | ||||
| -rw-r--r-- | tests/third_merge_check.hkl | 3 |
7 files changed, 155 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 50d98324..7a92e16e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,8 @@ bin_PROGRAMS = src/pattern_sim src/process_hkl src/get_hkl src/indexamajig \ noinst_PROGRAMS = tests/list_check -TESTS = tests/list_check +TESTS = tests/list_check tests/first_merge_check tests/second_merge_check \ + tests/third_merge_check if BUILD_HDFSEE bin_PROGRAMS += src/hdfsee diff --git a/Makefile.in b/Makefile.in index 71dad4e0..f50b3624 100644 --- a/Makefile.in +++ b/Makefile.in @@ -42,7 +42,9 @@ bin_PROGRAMS = src/pattern_sim$(EXEEXT) src/process_hkl$(EXEEXT) \ src/partialator$(EXEEXT) src/check_hkl$(EXEEXT) \ src/sum_stack$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) noinst_PROGRAMS = tests/list_check$(EXEEXT) $(am__EXEEXT_3) -TESTS = 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) @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/first_merge_check b/tests/first_merge_check new file mode 100755 index 00000000..bfec2188 --- /dev/null +++ b/tests/first_merge_check @@ -0,0 +1,43 @@ +#!/bin/sh + +cat > first_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 ----- + +----- 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 200.00 - 0.00 1.0 1 938.0 629.0 +End of reflections +----- End chunk ----- +EOF + +src/process_hkl -i first_merge_check.stream -o first_merge_check.hkl +diff first_merge_check.hkl tests/first_merge_check.hkl +if [ $? -ne 0 ]; then + exit 1 +fi +rm -f first_merge_check.stream first_merge_check.hkl +exit 0 diff --git a/tests/first_merge_check.hkl b/tests/first_merge_check.hkl new file mode 100644 index 00000000..a57f7c9c --- /dev/null +++ b/tests/first_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 150.00 - 35.36 - 2 0.0 0.0 +End of reflections diff --git a/tests/second_merge_check b/tests/second_merge_check new file mode 100755 index 00000000..ed002ebf --- /dev/null +++ b/tests/second_merge_check @@ -0,0 +1,43 @@ +#!/bin/sh + +cat > second_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 ----- + +----- 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 200.00 - 0.00 1.0 1 938.0 629.0 +End of reflections +----- End chunk ----- +EOF + +src/process_hkl -y -1 -i second_merge_check.stream -o second_merge_check.hkl +diff second_merge_check.hkl tests/first_merge_check.hkl +if [ $? -ne 0 ]; then + exit 1 +fi +rm -f second_merge_check.stream second_merge_check.hkl +exit 0 diff --git a/tests/third_merge_check b/tests/third_merge_check new file mode 100755 index 00000000..c5174c36 --- /dev/null +++ b/tests/third_merge_check @@ -0,0 +1,58 @@ +#!/bin/sh + +cat > third_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 ----- + +----- 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 200.00 - 0.00 1.0 1 938.0 629.0 +End of reflections +----- End chunk ----- + +----- 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 third_merge_check.stream -o third_merge_check.hkl +diff third_merge_check.hkl tests/third_merge_check.hkl +if [ $? -ne 0 ]; then + exit 1 +fi +rm -f third_merge_check.stream third_merge_check.hkl +exit 0 diff --git a/tests/third_merge_check.hkl b/tests/third_merge_check.hkl new file mode 100644 index 00000000..540dc3f3 --- /dev/null +++ b/tests/third_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 133.33 - 27.22 - 3 0.0 0.0 +End of reflections |