aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2018-11-14 09:58:31 +0100
committerThomas White <taw@physics.org>2018-11-14 09:58:31 +0100
commitc9bc96b35c89a4eb13557620556cb1b58f659d1a (patch)
tree695203a431a95b5acb032864d521bc572210883e /tests
parent71f4e6a5752f6586ec83a8c9606b100f2fe497fb (diff)
parent3563ec2b2dbc7d2090ed795a47e35a1b30b8b653 (diff)
Merge branch 'tom/logmerge'
Diffstat (limited to 'tests')
-rwxr-xr-xtests/partialator_merge_check_24
-rwxr-xr-xtests/partialator_merge_check_36
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/partialator_merge_check_2 b/tests/partialator_merge_check_2
index a8ff3ddd..9938f64f 100755
--- a/tests/partialator_merge_check_2
+++ b/tests/partialator_merge_check_2
@@ -44,8 +44,8 @@ cat > partialator_merge_check_2_ans.hkl << EOF
CrystFEL reflection list version 2.0
Symmetry: 1
h k l I phase sigma(I) nmeas
- 1 0 0 150.00 - 0.00 2
- 19 0 0 75.00 - 0.00 2
+ 1 0 0 141.42 - 0.00 2
+ 19 0 0 70.71 - 0.00 2
EOF
$PARTIALATOR -i partialator_merge_check_2.stream \
diff --git a/tests/partialator_merge_check_3 b/tests/partialator_merge_check_3
index 933422b0..2d237b02 100755
--- a/tests/partialator_merge_check_3
+++ b/tests/partialator_merge_check_3
@@ -45,9 +45,9 @@ cat > partialator_merge_check_3_ans.hkl << EOF
CrystFEL reflection list version 2.0
Symmetry: 4
h k l I phase sigma(I) nmeas
- 1 0 0 75.00 - 0.00 2
- 2 0 0 150.00 - 0.00 2
- 20 0 0 75.00 - 0.00 2
+ 1 0 0 70.71 - 0.00 2
+ 2 0 0 141.42 - 0.00 2
+ 20 0 0 70.71 - 0.00 2
EOF
$PARTIALATOR -i partialator_merge_check_3.stream \