diff options
| author | Thomas White <taw@physics.org> | 2013-03-07 10:36:26 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2013-03-07 10:36:26 +0100 |
| commit | 33260b9a7bf27a87afa1dde789f0b0d9ce28eaab (patch) | |
| tree | 686fcdfa791e2f4a14eb2f5575971021cde0d86f /tests/first_merge_check | |
| parent | 22cd1d08e6eeb6c8e43a709021746c057f6661d7 (diff) | |
| parent | 1e03ed982741fdc576ec5a915da120450df20499 (diff) | |
Merge branch 'tom/multicrystal'
Conflicts:
libcrystfel/src/mosflm.c
Diffstat (limited to 'tests/first_merge_check')
| -rwxr-xr-x | tests/first_merge_check | 12 |
1 files changed, 7 insertions, 5 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 |