Update partialator tests

3 files changed, 18 insertions, 90 deletions

diff --git a/tests/partialator_merge_check_1 b/tests/partialator_merge_check_1
index 2744dc25..6efa0337 100755
--- a/tests/partialator_merge_check_1
+++ b/tests/partialator_merge_check_1
@@ -5,12 +5,15 @@ 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
+photon_energy_eV = 6000.0
+beam_bandwidth = 0.05 %
+beam_divergence = 1 mrad
 --- 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
+profile_radius = 0.005 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
@@ -21,6 +24,7 @@ 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
+profile_radius = 0.005 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
@@ -39,35 +43,8 @@ Symmetry: unknown
 End of reflections
 EOF
 
-cat > partialator_merge_check_1.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_1.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_1.stream \
                 -o partialator_merge_check_1.hkl  \
-                -g partialator_merge_check_1.geom \
-                -b partialator_merge_check_1.beam \
                 --model=unity --iterations=0 --no-scale --no-polarisation
 
 diff partialator_merge_check_1.hkl partialator_merge_check_1_ans.hkl
@@ -75,6 +52,5 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 rm -f partialator_merge_check_1.stream partialator_merge_check_1.hkl \
-      partialator_merge_check_1_ans.hkl partialator_merge_check_1.beam \
-      partialator_merge_check_1.geom scaling-report.pdf partialator.params
+      partialator_merge_check_1_ans.hkl scaling-report.pdf partialator.params
 exit 0
diff --git a/tests/partialator_merge_check_2 b/tests/partialator_merge_check_2
index 2b0683d5..5b34ed73 100755
--- a/tests/partialator_merge_check_2
+++ b/tests/partialator_merge_check_2
@@ -5,12 +5,15 @@ 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
+photon_energy_eV = 6000.0
+beam_bandwidth = 0.05 %
+beam_divergence = 1 mrad
 --- 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
+profile_radius = 0.005 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
@@ -21,6 +24,7 @@ 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
+profile_radius = 0.005 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
@@ -40,35 +44,8 @@ Symmetry: unknown
 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 --no-polarisation
 
 diff partialator_merge_check_2.hkl partialator_merge_check_2_ans.hkl
@@ -76,6 +53,5 @@ 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 scaling-report.pdf partialator.params
+      partialator_merge_check_2_ans.hkl scaling-report.pdf partialator.params
 exit 0
diff --git a/tests/partialator_merge_check_3 b/tests/partialator_merge_check_3
index 49148c58..73f2a920 100755
--- a/tests/partialator_merge_check_3
+++ b/tests/partialator_merge_check_3
@@ -5,12 +5,15 @@ 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
+photon_energy_eV = 6000.0
+beam_bandwidth = 0.05 %
+beam_divergence = 1 mrad
 --- 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
+profile_radius = 0.005 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
@@ -22,6 +25,7 @@ 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
+profile_radius = 0.005 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
@@ -42,35 +46,8 @@ Symmetry: unknown
 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 --no-polarisation
 
 diff partialator_merge_check_3.hkl partialator_merge_check_3_ans.hkl
@@ -78,6 +55,5 @@ 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 scaling-report.pdf partialator.params
+      partialator_merge_check_3_ans.hkl scaling-report.pdf partialator.params
 exit 0