Rename first/second/third/fourth_merge_check to process_hkl_check_1/2/3/4

5 files changed, 36 insertions, 36 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e98c3202..02f3ca02 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,11 +1,11 @@
-add_test(NAME first_merge_check
-         COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/first_merge_check $<TARGET_FILE:process_hkl>)
-add_test(NAME second_merge_check
-         COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/second_merge_check $<TARGET_FILE:process_hkl>)
-add_test(NAME third_merge_check
-         COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/third_merge_check $<TARGET_FILE:process_hkl>)
-add_test(NAME fourth_merge_check
-         COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/fourth_merge_check $<TARGET_FILE:process_hkl>)
+add_test(NAME process_hkl_check_1
+         COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/process_hkl_check_1 $<TARGET_FILE:process_hkl>)
+add_test(NAME process_hkl_check_2
+         COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/process_hkl_check_2 $<TARGET_FILE:process_hkl>)
+add_test(NAME process_hkl_check_3
+         COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/process_hkl_check_3 $<TARGET_FILE:process_hkl>)
+add_test(NAME process_hkl_check_4
+         COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/process_hkl_check_4 $<TARGET_FILE:process_hkl>)
 add_test(NAME partialator_merge_check_1
          COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/partialator_merge_check_1 $<TARGET_FILE:partialator>)
 add_test(NAME partialator_merge_check_2
diff --git a/tests/first_merge_check b/tests/process_hkl_check_1
index 6ac8396a..2d65c0a9 100755
--- a/tests/first_merge_check
+++ b/tests/process_hkl_check_1
@@ -2,7 +2,7 @@
 
 PROCESS_HKL=$1
 
-cat > first_merge_check.stream << EOF
+cat > process_hkl_check_1.stream << EOF
 CrystFEL stream format 2.1
 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn
 ----- Begin chunk -----
@@ -36,22 +36,22 @@ End of reflections
 ----- End chunk -----
 EOF
 
-cat > first_merge_check_ans.hkl << EOF
+cat > process_hkl_check_1_ans.hkl << EOF
 CrystFEL reflection list version 2.0
 Symmetry: 1
    h    k    l          I    phase   sigma(I)   nmeas
    1    0    0     150.00        -      35.36       2
 EOF
 
-$PROCESS_HKL -i first_merge_check.stream -o first_merge_check.hkl --no-polarisation
+$PROCESS_HKL -i process_hkl_check_1.stream -o process_hkl_check_1.hkl --no-polarisation
 if [ $? -ne 0 ]; then
 	exit 1;
 fi
-sed -n '/End of reflections/q;p' first_merge_check.hkl > tempF.hkl
-mv tempF.hkl first_merge_check.hkl
-diff first_merge_check.hkl first_merge_check_ans.hkl
+sed -n '/End of reflections/q;p' process_hkl_check_1.hkl > tempF.hkl
+mv tempF.hkl process_hkl_check_1.hkl
+diff process_hkl_check_1.hkl process_hkl_check_1_ans.hkl
 if [ $? -ne 0 ]; then
 	exit 1
 fi
-rm -f first_merge_check.stream first_merge_check.hkl first_merge_check_ans.hkl
+rm -f process_hkl_check_1.stream process_hkl_check_1.hkl process_hkl_check_1_ans.hkl
 exit 0
diff --git a/tests/second_merge_check b/tests/process_hkl_check_2
index 3ef9fc50..b4d85fb4 100755
--- a/tests/second_merge_check
+++ b/tests/process_hkl_check_2
@@ -2,7 +2,7 @@
 
 PROCESS_HKL=$1
 
-cat > second_merge_check.stream << EOF
+cat > process_hkl_check_2.stream << EOF
 CrystFEL stream format 2.1
 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn
 ----- Begin chunk -----
@@ -36,22 +36,22 @@ End of reflections
 ----- End chunk -----
 EOF
 
-cat > second_merge_check_ans.hkl << EOF
+cat > process_hkl_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        -      35.36       2
 EOF
 
-$PROCESS_HKL -y -1 -i second_merge_check.stream -o second_merge_check.hkl --no-polarisation
+$PROCESS_HKL -y -1 -i process_hkl_check_2.stream -o process_hkl_check_2.hkl --no-polarisation
 if [ $? -ne 0 ]; then
 	exit 1;
 fi
-sed -n '/End of reflections/q;p' second_merge_check.hkl > tempS.hkl
-mv tempS.hkl second_merge_check.hkl
-diff second_merge_check.hkl second_merge_check_ans.hkl
+sed -n '/End of reflections/q;p' process_hkl_check_2.hkl > tempS.hkl
+mv tempS.hkl process_hkl_check_2.hkl
+diff process_hkl_check_2.hkl process_hkl_check_2_ans.hkl
 if [ $? -ne 0 ]; then
 	exit 1
 fi
-rm -f second_merge_check.stream second_merge_check.hkl second_merge_check_ans.hkl
+rm -f process_hkl_check_2.stream process_hkl_check_2.hkl process_hkl_check_2_ans.hkl
 exit 0
diff --git a/tests/third_merge_check b/tests/process_hkl_check_3
index 9ebb9f85..cef7996c 100755
--- a/tests/third_merge_check
+++ b/tests/process_hkl_check_3
@@ -2,7 +2,7 @@
 
 PROCESS_HKL=$1
 
-cat > third_merge_check.stream << EOF
+cat > process_hkl_check_3.stream << EOF
 CrystFEL stream format 2.1
 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn
 ----- Begin chunk -----
@@ -51,22 +51,22 @@ End of reflections
 ----- End chunk -----
 EOF
 
-cat > third_merge_check_ans.hkl << EOF
+cat > process_hkl_check_3_ans.hkl << EOF
 CrystFEL reflection list version 2.0
 Symmetry: 1
    h    k    l          I    phase   sigma(I)   nmeas
    1    0    0     133.33        -      27.22       3
 EOF
 
-$PROCESS_HKL -i third_merge_check.stream -o third_merge_check.hkl --no-polarisation
+$PROCESS_HKL -i process_hkl_check_3.stream -o process_hkl_check_3.hkl --no-polarisation
 if [ $? -ne 0 ]; then
 	exit 1;
 fi
-sed -n '/End of reflections/q;p' third_merge_check.hkl > tempT.hkl
-mv tempT.hkl third_merge_check.hkl
-diff third_merge_check.hkl third_merge_check_ans.hkl
+sed -n '/End of reflections/q;p' process_hkl_check_3.hkl > tempT.hkl
+mv tempT.hkl process_hkl_check_3.hkl
+diff process_hkl_check_3.hkl process_hkl_check_3_ans.hkl
 if [ $? -ne 0 ]; then
 	exit 1
 fi
-rm -f third_merge_check.stream third_merge_check.hkl third_merge_check_ans.hkl
+rm -f process_hkl_check_3.stream process_hkl_check_3.hkl process_hkl_check_3_ans.hkl
 exit 0
diff --git a/tests/fourth_merge_check b/tests/process_hkl_check_4
index 67c87e86..aa36f112 100755
--- a/tests/fourth_merge_check
+++ b/tests/process_hkl_check_4
@@ -2,7 +2,7 @@
 
 PROCESS_HKL=$1
 
-cat > fourth_merge_check.stream << EOF
+cat > process_hkl_check_4.stream << EOF
 CrystFEL stream format 2.1
 Command line: indexamajig -i dummy.lst -o dummy.stream --kraken=prawn
 ----- Begin chunk -----
@@ -21,21 +21,21 @@ End of reflections
 ----- End chunk -----
 EOF
 
-cat > fourth_merge_check_ans.hkl << EOF
+cat > process_hkl_check_4_ans.hkl << EOF
 CrystFEL reflection list version 2.0
 Symmetry: 1
    h    k    l          I    phase   sigma(I)   nmeas
 EOF
 
-$PROCESS_HKL -i fourth_merge_check.stream -o fourth_merge_check.hkl --no-polarisation
+$PROCESS_HKL -i process_hkl_check_4.stream -o process_hkl_check_4.hkl --no-polarisation
 if [ $? -ne 0 ]; then
 	exit 1;
 fi
-sed -n '/End of reflections/q;p' fourth_merge_check.hkl > tempf.hkl
-mv tempf.hkl fourth_merge_check.hkl
-diff fourth_merge_check.hkl fourth_merge_check_ans.hkl
+sed -n '/End of reflections/q;p' process_hkl_check_4.hkl > tempf.hkl
+mv tempf.hkl process_hkl_check_4.hkl
+diff process_hkl_check_4.hkl process_hkl_check_4_ans.hkl
 if [ $? -ne 0 ]; then
 	exit 1
 fi
-rm -f fourth_merge_check.stream fourth_merge_check.hkl fourth_merge_check_ans.hkl
+rm -f process_hkl_check_4.stream process_hkl_check_4.hkl process_hkl_check_4_ans.hkl
 exit 0