Update merge tests for new stream format

4 files changed, 28 insertions, 20 deletions

diff --git a/tests/first_merge_check b/tests/first_merge_check
index 686222cb..d649e284 100755
--- a/tests/first_merge_check
+++ b/tests/first_merge_check
@@ -1,34 +1,36 @@
 #!/bin/sh
 
 cat > first_merge_check.stream << EOF
-CrystFEL stream format 2.0
+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
-I0 = 1.0 (arbitrary units)
-photon_energy_eV = 2000.0
 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
 End of reflections
+--- End crystal
 ----- End chunk -----
 
 ----- 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
-I0 = 1.0 (arbitrary units)
-photon_energy_eV = 2000.0
 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
 End of reflections
+--- End crystal
 ----- End chunk -----
 EOF
 
diff --git a/tests/fourth_merge_check b/tests/fourth_merge_check
index 619afc02..e2d2487f 100755
--- a/tests/fourth_merge_check
+++ b/tests/fourth_merge_check
@@ -1,20 +1,21 @@
 #!/bin/sh
 
 cat > fourth_merge_check.stream << EOF
-CrystFEL stream format 2.0
+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
-I0 = 1.0 (arbitrary units)
-photon_energy_eV = 2000.0
 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
 End of reflections
+--- End crystal
 ----- End chunk -----
 EOF
 
diff --git a/tests/second_merge_check b/tests/second_merge_check
index af952030..aec5b120 100755
--- a/tests/second_merge_check
+++ b/tests/second_merge_check
@@ -1,34 +1,36 @@
 #!/bin/sh
 
 cat > second_merge_check.stream << EOF
-CrystFEL stream format 2.0
+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
-I0 = 1.0 (arbitrary units)
-photon_energy_eV = 2000.0
 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
 End of reflections
+--- End crystal
 ----- End chunk -----
 
 ----- 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
-I0 = 1.0 (arbitrary units)
-photon_energy_eV = 2000.0
 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
 End of reflections
+--- End crystal
 ----- End chunk -----
 EOF
 
diff --git a/tests/third_merge_check b/tests/third_merge_check
index f3cfb637..569d5ddf 100755
--- a/tests/third_merge_check
+++ b/tests/third_merge_check
@@ -1,48 +1,51 @@
 #!/bin/sh
 
 cat > third_merge_check.stream << EOF
-CrystFEL stream format 2.0
+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
-I0 = 1.0 (arbitrary units)
-photon_energy_eV = 2000.0
 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
 End of reflections
+--- End crystal
 ----- End chunk -----
 
 ----- 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
-I0 = 1.0 (arbitrary units)
-photon_energy_eV = 2000.0
 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
 End of reflections
+--- End crystal
 ----- End chunk -----
 
 ----- 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
-I0 = 1.0 (arbitrary units)
-photon_energy_eV = 2000.0
 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
 End of reflections
+--- End crystal
 ----- End chunk -----
 EOF