Add new tests

4 files changed, 171 insertions, 4 deletions

diff --git a/Makefile.am b/Makefile.am
index f465ba36..af810dd8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,14 +11,19 @@ noinst_PROGRAMS = tests/list_check tests/integration_check \
                   tests/centering_check tests/transformation_check \
                   tests/cell_check
 
-TESTS = tests/list_check tests/first_merge_check tests/second_merge_check \
-        tests/third_merge_check tests/fourth_merge_check \
+MERGE_CHECKS = tests/first_merge_check tests/second_merge_check \
+               tests/third_merge_check tests/fourth_merge_check
+
+PARTIAL_CHECKS = tests/partialator_merge_check_1 \
+                 tests/partialator_merge_check_2 \
+                 tests/partialator_merge_check_3
+
+TESTS = tests/list_check $(MERGE_CHECKS) $(PARTIAL_CHECKS) \
         tests/integration_check tests/pr_gradient_check \
         tests/symmetry_check tests/centering_check tests/transformation_check \
         tests/cell_check
 
-EXTRA_DIST += tests/first_merge_check tests/second_merge_check \
-              tests/third_merge_check tests/fourth_merge_check
+EXTRA_DIST += $(MERGE_CHECKS) $(PARTIAL_CHECKS)
 
 if BUILD_HDFSEE
 bin_PROGRAMS += src/hdfsee
diff --git a/tests/partialator_merge_check_1 b/tests/partialator_merge_check_1
index 98c34d65..9125b75b 100755
--- a/tests/partialator_merge_check_1
+++ b/tests/partialator_merge_check_1
@@ -29,6 +29,8 @@ End of reflections
 ----- End chunk -----
 EOF
 
+# We merge two patterns, without scaling or partiality, the result should just
+# be an average.
 cat > partialator_merge_check_1_ans.hkl << EOF
   h   k   l          I    phase   sigma(I)  counts  fs/px  ss/px
   1   0   0     150.00        -      35.36       2    0.0    0.0
diff --git a/tests/partialator_merge_check_2 b/tests/partialator_merge_check_2
new file mode 100755
index 00000000..50b0c9bf
--- /dev/null
+++ b/tests/partialator_merge_check_2
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+cat > partialator_merge_check_2.stream << EOF
+CrystFEL stream format 2.1
+Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn
+----- Begin chunk -----
+Image filename: dummy.h5
+photon_energy_eV = 2000.0
+--- Begin crystal
+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
+Reflections measured after indexing
+  h   k   l          I    phase   sigma(I)  counts  fs/px  ss/px
+  1   0   0     100.00        -       1.00       1  938.0  629.0
+End of reflections
+--- End crystal
+--- Begin crystal
+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
+Reflections measured after indexing
+  h   k   l          I    phase   sigma(I)  counts  fs/px  ss/px
+  1   0   0     200.00        -       1.00       1  938.0  629.0
+End of reflections
+--- End crystal
+----- End chunk -----
+EOF
+
+# We merge two patterns, without partiality but with scaling, the result should
+# be the mean but with the standard deviation should be zero because the scaling
+# factor can absorb the difference.
+cat > partialator_merge_check_2_ans.hkl << EOF
+  h   k   l          I    phase   sigma(I)  counts  fs/px  ss/px
+  1   0   0     150.00        -       0.00       2    0.0    0.0
+End of reflections
+EOF
+
+cat > partialator_merge_check_2.beam << EOF
+beam/fluence = 2.0e15
+beam/radius = 1.5e-6
+beam/photon_energy = 6000.0
+beam/bandwidth = 0.0005
+beam/divergence = 0.001
+profile_radius = 0.005e9
+EOF
+
+cat > partialator_merge_check_2.geom << EOF
+0/min_fs = 0
+0/max_fs = 1023
+0/min_ss = 0
+0/max_ss = 1023
+0/corner_x = -512.00
+0/corner_y = -512.00
+0/fs = x
+0/ss = y
+0/clen = 70.0e-3
+0/res = 13333.3  ; 75 micron pixel size
+0/badrow_direction = y
+0/adu_per_eV = 1.0
+EOF
+
+
+src/partialator -i partialator_merge_check_2.stream \
+                -o partialator_merge_check_2.hkl  \
+                -g partialator_merge_check_2.geom \
+                -b partialator_merge_check_2.beam \
+                --model=unity --iterations=0
+
+diff partialator_merge_check_2.hkl partialator_merge_check_2_ans.hkl
+if [ $? -ne 0 ]; then
+	exit 1
+fi
+rm -f partialator_merge_check_2.stream partialator_merge_check_2.hkl \
+      partialator_merge_check_2_ans.hkl partialator_merge_check_2.beam \
+      partialator_merge_check_2.geom
+exit 0
diff --git a/tests/partialator_merge_check_3 b/tests/partialator_merge_check_3
new file mode 100755
index 00000000..82b3b787
--- /dev/null
+++ b/tests/partialator_merge_check_3
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+cat > partialator_merge_check_3.stream << EOF
+CrystFEL stream format 2.1
+Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn
+----- Begin chunk -----
+Image filename: dummy.h5
+photon_energy_eV = 2000.0
+--- Begin crystal
+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
+Reflections measured after indexing
+  h   k   l          I    phase   sigma(I)  counts  fs/px  ss/px
+  0   1   0     110.00        -       1.00       1  938.0  629.0
+  2   0   0     190.00        -       1.00       1  938.0  629.0
+End of reflections
+--- End crystal
+--- Begin crystal
+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
+Reflections measured after indexing
+  h   k   l          I    phase   sigma(I)  counts  fs/px  ss/px
+  1   0   0      50.00        -       1.00       1  938.0  629.0
+  0   2   0     100.00        -       1.00       1  938.0  629.0
+  0   1   1       1.00        -       1.00       1  938.0  629.0
+End of reflections
+--- End crystal
+----- End chunk -----
+EOF
+
+# W
+cat > partialator_merge_check_3_ans.hkl << EOF
+  h   k   l          I    phase   sigma(I)  counts  fs/px  ss/px
+  1   0   0      81.17        -       3.62       2    0.0    0.0
+  2   0   0     144.36        -       2.04       2    0.0    0.0
+End of reflections
+EOF
+
+cat > partialator_merge_check_3.beam << EOF
+beam/fluence = 2.0e15
+beam/radius = 1.5e-6
+beam/photon_energy = 6000.0
+beam/bandwidth = 0.0005
+beam/divergence = 0.001
+profile_radius = 0.005e9
+EOF
+
+cat > partialator_merge_check_3.geom << EOF
+0/min_fs = 0
+0/max_fs = 1023
+0/min_ss = 0
+0/max_ss = 1023
+0/corner_x = -512.00
+0/corner_y = -512.00
+0/fs = x
+0/ss = y
+0/clen = 70.0e-3
+0/res = 13333.3  ; 75 micron pixel size
+0/badrow_direction = y
+0/adu_per_eV = 1.0
+EOF
+
+
+src/partialator -i partialator_merge_check_3.stream \
+                -o partialator_merge_check_3.hkl  \
+                -g partialator_merge_check_3.geom \
+                -b partialator_merge_check_3.beam \
+                --model=unity --iterations=0 -y 4
+
+diff partialator_merge_check_3.hkl partialator_merge_check_3_ans.hkl
+if [ $? -ne 0 ]; then
+	exit 1
+fi
+rm -f partialator_merge_check_3.stream partialator_merge_check_3.hkl \
+      partialator_merge_check_3_ans.hkl partialator_merge_check_3.beam \
+      partialator_merge_check_3.geom
+exit 0