From cc2502e38dc93057cadf271614eea1ca3794ad13 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 10 Mar 2014 17:03:03 +0100 Subject: Update merge tests for new stream format --- tests/first_merge_check | 6 ++++-- tests/fourth_merge_check | 4 +++- tests/partialator_merge_check_1 | 6 ++++-- tests/partialator_merge_check_2 | 6 ++++-- tests/partialator_merge_check_3 | 8 +++++--- tests/second_merge_check | 6 ++++-- tests/third_merge_check | 6 ++++-- 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/tests/first_merge_check b/tests/first_merge_check index d649e284..5cf7cc70 100755 --- a/tests/first_merge_check +++ b/tests/first_merge_check @@ -35,8 +35,10 @@ End of reflections EOF cat > first_merge_check_ans.hkl << EOF - h k l I phase sigma(I) counts fs/px ss/px - 1 0 0 150.03 - 35.36 2 0.0 0.0 +CrystFEL reflection list version 2.0 +Symmetry: 1 + h k l I phase sigma(I) nmeas + 1 0 0 150.03 - 35.36 2 End of reflections EOF diff --git a/tests/fourth_merge_check b/tests/fourth_merge_check index e2d2487f..bbe32b9b 100755 --- a/tests/fourth_merge_check +++ b/tests/fourth_merge_check @@ -20,7 +20,9 @@ End of reflections EOF cat > fourth_merge_check_ans.hkl << EOF - h k l I phase sigma(I) counts fs/px ss/px +CrystFEL reflection list version 2.0 +Symmetry: 1 + h k l I phase sigma(I) nmeas End of reflections EOF diff --git a/tests/partialator_merge_check_1 b/tests/partialator_merge_check_1 index 05b74e97..f1a6adf5 100755 --- a/tests/partialator_merge_check_1 +++ b/tests/partialator_merge_check_1 @@ -32,8 +32,10 @@ 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 +CrystFEL reflection list version 2.0 +Symmetry: unknown + h k l I phase sigma(I) nmeas + 1 0 0 150.00 - 35.36 2 End of reflections EOF diff --git a/tests/partialator_merge_check_2 b/tests/partialator_merge_check_2 index be48249c..5513f5ec 100755 --- a/tests/partialator_merge_check_2 +++ b/tests/partialator_merge_check_2 @@ -33,8 +33,10 @@ EOF # 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 +CrystFEL reflection list version 2.0 +Symmetry: unknown + h k l I phase sigma(I) nmeas + 1 0 0 150.00 - 0.00 2 End of reflections EOF diff --git a/tests/partialator_merge_check_3 b/tests/partialator_merge_check_3 index 9a2293fd..274d7c2d 100755 --- a/tests/partialator_merge_check_3 +++ b/tests/partialator_merge_check_3 @@ -34,9 +34,11 @@ 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 78.40 - 3.15 2 0.0 0.0 - 2 0 0 145.51 - 1.70 2 0.0 0.0 +CrystFEL reflection list version 2.0 +Symmetry: unknown + h k l I phase sigma(I) nmeas + 1 0 0 78.40 - 3.15 2 + 2 0 0 145.51 - 1.70 2 End of reflections EOF diff --git a/tests/second_merge_check b/tests/second_merge_check index aec5b120..d34cc75e 100755 --- a/tests/second_merge_check +++ b/tests/second_merge_check @@ -35,8 +35,10 @@ End of reflections EOF cat > second_merge_check_ans.hkl << EOF - h k l I phase sigma(I) counts fs/px ss/px - 1 0 0 150.03 - 35.36 2 0.0 0.0 +CrystFEL reflection list version 2.0 +Symmetry: -1 + h k l I phase sigma(I) nmeas + 1 0 0 150.03 - 35.36 2 End of reflections EOF diff --git a/tests/third_merge_check b/tests/third_merge_check index 569d5ddf..81f9ad78 100755 --- a/tests/third_merge_check +++ b/tests/third_merge_check @@ -50,8 +50,10 @@ End of reflections EOF cat > third_merge_check_ans.hkl << EOF - h k l I phase sigma(I) counts fs/px ss/px - 1 0 0 133.36 - 27.22 3 0.0 0.0 +CrystFEL reflection list version 2.0 +Symmetry: 1 + h k l I phase sigma(I) nmeas + 1 0 0 133.36 - 27.22 3 End of reflections EOF -- cgit v1.2.3