Update merging tests to latest stream version

7 files changed, 56 insertions, 42 deletions

diff --git a/tests/partialator_merge_check_1 b/tests/partialator_merge_check_1
index 137f6128..4ed03785 100755
--- a/tests/partialator_merge_check_1
+++ b/tests/partialator_merge_check_1
@@ -3,7 +3,7 @@
 PARTIALATOR=$1
 
 cat > partialator_merge_check_1.stream << EOF
-CrystFEL stream format 2.1
+CrystFEL stream format 2.3
 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn
 ----- Begin geometry file -----
 photon_energy = 9000 eV
@@ -11,6 +11,8 @@ panel/min_fs = 0
 panel/min_ss = 0
 panel/max_fs = 1023
 panel/max_ss = 1023
+panel/fs = x
+panel/ss = y
 panel/corner_x = -100
 panel/corner_y = -100
 panel/clen = 50 mm
@@ -30,8 +32,8 @@ bstar = -0.0068281 +0.0403989 -0.0005196 nm^-1
 cstar = +0.0406926 +0.0052233 -0.0426520 nm^-1
 profile_radius = 0.0005 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
+   h    k    l          I   sigma(I)       peak background  fs/px  ss/px panel
+   1   0   0       100.00       0.00      100.0        0.0  938.0  629.0 panel
 End of reflections
 --- End crystal
 --- Begin crystal
@@ -41,8 +43,8 @@ bstar = -0.0068281 +0.0403989 -0.0005196 nm^-1
 cstar = +0.0406926 +0.0052233 -0.0426520 nm^-1
 profile_radius = 0.0005 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
+   h    k    l          I   sigma(I)       peak background  fs/px  ss/px panel
+   1   0   0       200.00       0.00      100.0        0.0  938.0  629.0 panel
 End of reflections
 --- End crystal
 ----- End chunk -----
diff --git a/tests/partialator_merge_check_2 b/tests/partialator_merge_check_2
index 05881426..2ebcd74e 100755
--- a/tests/partialator_merge_check_2
+++ b/tests/partialator_merge_check_2
@@ -3,7 +3,7 @@
 PARTIALATOR=$1
 
 cat > partialator_merge_check_2.stream << EOF
-CrystFEL stream format 2.1
+CrystFEL stream format 2.3
 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn
 ----- Begin geometry file -----
 photon_energy = 9000 eV
@@ -11,6 +11,8 @@ panel/min_fs = 0
 panel/min_ss = 0
 panel/max_fs = 1023
 panel/max_ss = 1023
+panel/fs = x
+panel/ss = y
 panel/corner_x = -100
 panel/corner_y = -100
 panel/clen = 50 mm
@@ -30,9 +32,9 @@ bstar = -0.0068281 +0.0403989 -0.0005196 nm^-1
 cstar = +0.0406926 +0.0052233 -0.0426520 nm^-1
 profile_radius = 0.0005 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
- 19   0   0      50.00        -       1.00       1  938.0  629.0
+   h    k    l          I   sigma(I)       peak background  fs/px  ss/px panel
+   1   0   0       100.00       1.00      100.0        0.0  938.0  629.0 panel
+  19   0   0        50.00       1.00      100.0        0.0  938.0  629.0 panel
 End of reflections
 --- End crystal
 --- Begin crystal
@@ -42,9 +44,9 @@ bstar = -0.0068281 +0.0403989 -0.0005196 nm^-1
 cstar = +0.0406926 +0.0052233 -0.0426520 nm^-1
 profile_radius = 0.0005 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
- 19   0   0     100.00        -       1.00       1  938.0  629.0
+   h    k    l          I   sigma(I)       peak background  fs/px  ss/px panel
+   1   0   0       200.00       1.00      100.0        0.0  938.0  629.0 panel
+  19   0   0       100.00       1.00      100.0        0.0  938.0  629.0 panel
 End of reflections
 --- End crystal
 ----- End chunk -----
diff --git a/tests/partialator_merge_check_3 b/tests/partialator_merge_check_3
index ece2ad3f..8c998258 100755
--- a/tests/partialator_merge_check_3
+++ b/tests/partialator_merge_check_3
@@ -3,7 +3,7 @@
 PARTIALATOR=$1
 
 cat > partialator_merge_check_3.stream << EOF
-CrystFEL stream format 2.1
+CrystFEL stream format 2.3
 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn
 ----- Begin geometry file -----
 photon_energy = 9000 eV
@@ -11,6 +11,8 @@ panel/min_fs = 0
 panel/min_ss = 0
 panel/max_fs = 1023
 panel/max_ss = 1023
+panel/fs = x
+panel/ss = y
 panel/corner_x = -100
 panel/corner_y = -100
 panel/clen = 50 mm
@@ -30,10 +32,10 @@ bstar = -0.0068281 +0.0403989 -0.0005196 nm^-1
 cstar = +0.0406926 +0.0052233 -0.0426520 nm^-1
 profile_radius = 0.0005 nm^-1
 Reflections measured after indexing
-  h   k   l          I    phase   sigma(I)  counts  fs/px  ss/px
-  0   1   0     100.00        -       1.00       1  938.0  629.0
-  2   0   0     200.00        -       1.00       1  938.0  629.0
- 20   0   0     100.00        -       1.00       1  938.0  629.0
+   h    k    l          I   sigma(I)       peak background  fs/px  ss/px panel
+   0   1   0       100.00       1.00      100.0        0.0  938.0  629.0 panel
+   2   0   0       200.00       1.00      100.0        0.0  938.0  629.0 panel
+  20   0   0       100.00       1.00      100.0        0.0  938.0  629.0 panel
 End of reflections
 --- End crystal
 --- Begin crystal
@@ -43,11 +45,11 @@ bstar = -0.0068281 +0.0403989 -0.0005196 nm^-1
 cstar = +0.0406926 +0.0052233 -0.0426520 nm^-1
 profile_radius = 0.0005 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
- 20   0   0      50.00        -       1.00       1  938.0  629.0
+   h    k    l          I   sigma(I)       peak background  fs/px  ss/px panel
+   1   0   0        50.00       1.00      100.0        0.0  938.0  629.0 panel
+   0   2   0       100.00       1.00      100.0        0.0  938.0  629.0 panel
+   0   1   1         1.00       1.00      100.0        0.0  938.0  629.0 panel
+  20   0   0        50.00       1.00      100.0        0.0  938.0  629.0 panel
 End of reflections
 --- End crystal
 ----- End chunk -----
diff --git a/tests/process_hkl_check_1 b/tests/process_hkl_check_1
index 8496041d..7cd29335 100755
--- a/tests/process_hkl_check_1
+++ b/tests/process_hkl_check_1
@@ -3,7 +3,7 @@
 PROCESS_HKL=$1
 
 cat > process_hkl_check_1.stream << EOF
-CrystFEL stream format 2.1
+CrystFEL stream format 2.3
 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn
 ----- Begin geometry file -----
 photon_energy = 9000 eV
@@ -11,6 +11,8 @@ panel/min_fs = 0
 panel/min_ss = 0
 panel/max_fs = 1023
 panel/max_ss = 1023
+panel/fs = x
+panel/ss = y
 panel/corner_x = -100
 panel/corner_y = -100
 panel/clen = 50 mm
@@ -27,8 +29,8 @@ 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        -       0.00       1  938.0  629.0
+   h    k    l          I   sigma(I)       peak background  fs/px  ss/px panel
+   1   0   0       100.00       0.00      100.0        0.0  938.0  629.0 panel
 End of reflections
 --- End crystal
 ----- End chunk -----
@@ -42,8 +44,8 @@ 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        -       0.00       1  938.0  629.0
+   h    k    l          I   sigma(I)       peak background  fs/px  ss/px panel
+   1   0   0       200.00       0.00      100.0        0.0  938.0  629.0 panel
 End of reflections
 --- End crystal
 ----- End chunk -----
diff --git a/tests/process_hkl_check_2 b/tests/process_hkl_check_2
index 2dec8840..1ce4bc3c 100755
--- a/tests/process_hkl_check_2
+++ b/tests/process_hkl_check_2
@@ -3,7 +3,7 @@
 PROCESS_HKL=$1
 
 cat > process_hkl_check_2.stream << EOF
-CrystFEL stream format 2.1
+CrystFEL stream format 2.3
 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn
 ----- Begin geometry file -----
 photon_energy = 9000 eV
@@ -11,6 +11,8 @@ panel/min_fs = 0
 panel/min_ss = 0
 panel/max_fs = 1023
 panel/max_ss = 1023
+panel/fs = x
+panel/ss = y
 panel/corner_x = -100
 panel/corner_y = -100
 panel/clen = 50 mm
@@ -27,8 +29,8 @@ 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        -       0.00       1  938.0  629.0
+   h    k    l          I   sigma(I)       peak background  fs/px  ss/px panel
+   1   0   0       100.00       0.00      100.0        0.0  938.0  629.0 panel
 End of reflections
 --- End crystal
 ----- End chunk -----
@@ -42,8 +44,8 @@ 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        -       0.00       1  938.0  629.0
+   h    k    l          I   sigma(I)       peak background  fs/px  ss/px panel
+   1   0   0       200.00       0.00      100.0        0.0  938.0  629.0 panel
 End of reflections
 --- End crystal
 ----- End chunk -----
diff --git a/tests/process_hkl_check_3 b/tests/process_hkl_check_3
index 763f6e87..4e884ad2 100755
--- a/tests/process_hkl_check_3
+++ b/tests/process_hkl_check_3
@@ -3,7 +3,7 @@
 PROCESS_HKL=$1
 
 cat > process_hkl_check_3.stream << EOF
-CrystFEL stream format 2.1
+CrystFEL stream format 2.3
 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn
 ----- Begin geometry file -----
 photon_energy = 9000 eV
@@ -11,6 +11,8 @@ panel/min_fs = 0
 panel/min_ss = 0
 panel/max_fs = 1023
 panel/max_ss = 1023
+panel/fs = x
+panel/ss = y
 panel/corner_x = -100
 panel/corner_y = -100
 panel/clen = 50 mm
@@ -27,8 +29,8 @@ 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        -       0.00       1  938.0  629.0
+   h    k    l          I   sigma(I)       peak background  fs/px  ss/px panel
+   1   0   0       100.00       0.00      100.0        0.0  938.0  629.0 panel
 End of reflections
 --- End crystal
 ----- End chunk -----
@@ -42,8 +44,8 @@ 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        -       0.00       1  938.0  629.0
+   h    k    l          I   sigma(I)       peak background  fs/px  ss/px panel
+   1   0   0       200.00       0.00      100.0        0.0  938.0  629.0 panel
 End of reflections
 --- End crystal
 ----- End chunk -----
@@ -57,8 +59,8 @@ 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        -       0.00       1  938.0  629.0
+   h    k    l          I   sigma(I)       peak background  fs/px  ss/px panel
+   1   0   0       100.00       0.00      100.0        0.0  938.0  629.0 panel
 End of reflections
 --- End crystal
 ----- End chunk -----
diff --git a/tests/process_hkl_check_4 b/tests/process_hkl_check_4
index 1b267cf9..4b2e2946 100755
--- a/tests/process_hkl_check_4
+++ b/tests/process_hkl_check_4
@@ -3,7 +3,7 @@
 PROCESS_HKL=$1
 
 cat > process_hkl_check_4.stream << EOF
-CrystFEL stream format 2.1
+CrystFEL stream format 2.3
 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn
 ----- Begin geometry file -----
 photon_energy = 9000 eV
@@ -11,6 +11,8 @@ panel/min_fs = 0
 panel/min_ss = 0
 panel/max_fs = 1023
 panel/max_ss = 1023
+panel/fs = x
+panel/ss = y
 panel/corner_x = -100
 panel/corner_y = -100
 panel/clen = 50 mm
@@ -27,8 +29,8 @@ 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        -       0.00       1  938.0  629.0
+   h    k    l          I   sigma(I)       peak background  fs/px  ss/px panel
+   1   0   0       100.00       0.00      100.0        0.0  938.0  629.0 panel
 End of reflections
 --- End crystal
 ----- End chunk -----