aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtests/first_merge_check4
-rwxr-xr-xtests/fourth_merge_check4
-rwxr-xr-xtests/partialator_merge_check_14
-rwxr-xr-xtests/partialator_merge_check_24
-rwxr-xr-xtests/partialator_merge_check_34
-rwxr-xr-xtests/second_merge_check4
-rwxr-xr-xtests/third_merge_check4
7 files changed, 21 insertions, 7 deletions
diff --git a/tests/first_merge_check b/tests/first_merge_check
index 5cf7cc70..bb1484bd 100755
--- a/tests/first_merge_check
+++ b/tests/first_merge_check
@@ -39,10 +39,12 @@ 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
src/process_hkl -i first_merge_check.stream -o first_merge_check.hkl
+ex -c '/End of reflections/
+.,$d
+x' first_merge_check.hkl
diff first_merge_check.hkl first_merge_check_ans.hkl
if [ $? -ne 0 ]; then
exit 1
diff --git a/tests/fourth_merge_check b/tests/fourth_merge_check
index bbe32b9b..1c738da7 100755
--- a/tests/fourth_merge_check
+++ b/tests/fourth_merge_check
@@ -23,10 +23,12 @@ cat > fourth_merge_check_ans.hkl << EOF
CrystFEL reflection list version 2.0
Symmetry: 1
h k l I phase sigma(I) nmeas
-End of reflections
EOF
src/process_hkl -i fourth_merge_check.stream -o fourth_merge_check.hkl
+ex -c '/End of reflections/
+.,$d
+x' fourth_merge_check.hkl
diff fourth_merge_check.hkl fourth_merge_check_ans.hkl
if [ $? -ne 0 ]; then
exit 1
diff --git a/tests/partialator_merge_check_1 b/tests/partialator_merge_check_1
index 6ff190ea..d39c2009 100755
--- a/tests/partialator_merge_check_1
+++ b/tests/partialator_merge_check_1
@@ -40,13 +40,15 @@ CrystFEL reflection list version 2.0
Symmetry: 1
h k l I phase sigma(I) nmeas
1 0 0 150.00 - 35.36 2
-End of reflections
EOF
src/partialator -i partialator_merge_check_1.stream \
-o partialator_merge_check_1.hkl \
--model=unity --iterations=0 --no-scale --no-polarisation
+ex -c '/End of reflections/
+.,$d
+x' partialator_merge_check_1.hkl
diff partialator_merge_check_1.hkl partialator_merge_check_1_ans.hkl
if [ $? -ne 0 ]; then
exit 1
diff --git a/tests/partialator_merge_check_2 b/tests/partialator_merge_check_2
index 72af6e63..104f9fc4 100755
--- a/tests/partialator_merge_check_2
+++ b/tests/partialator_merge_check_2
@@ -44,7 +44,6 @@ 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
-End of reflections
EOF
src/partialator -i partialator_merge_check_2.stream \
@@ -52,6 +51,9 @@ src/partialator -i partialator_merge_check_2.stream \
--model=unity --iterations=1 --no-polarisation \
--no-free
+ex -c '/End of reflections/
+.,$d
+x' partialator_merge_check_2.hkl
diff partialator_merge_check_2.hkl partialator_merge_check_2_ans.hkl
if [ $? -ne 0 ]; then
exit 1
diff --git a/tests/partialator_merge_check_3 b/tests/partialator_merge_check_3
index 4579d65a..08f9f481 100755
--- a/tests/partialator_merge_check_3
+++ b/tests/partialator_merge_check_3
@@ -46,7 +46,6 @@ Symmetry: 4
1 0 0 75.00 - 0.00 2
2 0 0 150.00 - 0.00 2
20 0 0 75.00 - 0.00 2
-End of reflections
EOF
src/partialator -i partialator_merge_check_3.stream \
@@ -54,6 +53,9 @@ src/partialator -i partialator_merge_check_3.stream \
--model=unity --iterations=1 -y 4 --no-polarisation \
--no-free
+ex -c '/End of reflections/
+.,$d
+x' partialator_merge_check_3.hkl
diff partialator_merge_check_3.hkl partialator_merge_check_3_ans.hkl
if [ $? -ne 0 ]; then
exit 1
diff --git a/tests/second_merge_check b/tests/second_merge_check
index d34cc75e..ed2ba9f9 100755
--- a/tests/second_merge_check
+++ b/tests/second_merge_check
@@ -39,10 +39,12 @@ 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
src/process_hkl -y -1 -i second_merge_check.stream -o second_merge_check.hkl
+ex -c '/End of reflections/
+.,$d
+x' second_merge_check.hkl
diff second_merge_check.hkl second_merge_check_ans.hkl
if [ $? -ne 0 ]; then
exit 1
diff --git a/tests/third_merge_check b/tests/third_merge_check
index 81f9ad78..714afb7f 100755
--- a/tests/third_merge_check
+++ b/tests/third_merge_check
@@ -54,10 +54,12 @@ 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
src/process_hkl -i third_merge_check.stream -o third_merge_check.hkl
+ex -c '/End of reflections/
+.,$d
+x' third_merge_check.hkl
diff third_merge_check.hkl third_merge_check_ans.hkl
if [ $? -ne 0 ]; then
exit 1