From a604828f8a21399574a39d9b3ce38b116fd98ee6 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 25 Jun 2018 16:28:32 +0200 Subject: Rename first/second/third/fourth_merge_check to process_hkl_check_1/2/3/4 --- tests/CMakeLists.txt | 16 +++++------ tests/first_merge_check | 57 ------------------------------------- tests/fourth_merge_check | 41 --------------------------- tests/process_hkl_check_1 | 57 +++++++++++++++++++++++++++++++++++++ tests/process_hkl_check_2 | 57 +++++++++++++++++++++++++++++++++++++ tests/process_hkl_check_3 | 72 +++++++++++++++++++++++++++++++++++++++++++++++ tests/process_hkl_check_4 | 41 +++++++++++++++++++++++++++ tests/second_merge_check | 57 ------------------------------------- tests/third_merge_check | 72 ----------------------------------------------- 9 files changed, 235 insertions(+), 235 deletions(-) delete mode 100755 tests/first_merge_check delete mode 100755 tests/fourth_merge_check create mode 100755 tests/process_hkl_check_1 create mode 100755 tests/process_hkl_check_2 create mode 100755 tests/process_hkl_check_3 create mode 100755 tests/process_hkl_check_4 delete mode 100755 tests/second_merge_check delete mode 100755 tests/third_merge_check 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 $) -add_test(NAME second_merge_check - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/second_merge_check $) -add_test(NAME third_merge_check - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/third_merge_check $) -add_test(NAME fourth_merge_check - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/fourth_merge_check $) +add_test(NAME process_hkl_check_1 + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/process_hkl_check_1 $) +add_test(NAME process_hkl_check_2 + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/process_hkl_check_2 $) +add_test(NAME process_hkl_check_3 + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/process_hkl_check_3 $) +add_test(NAME process_hkl_check_4 + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/process_hkl_check_4 $) add_test(NAME partialator_merge_check_1 COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/partialator_merge_check_1 $) add_test(NAME partialator_merge_check_2 diff --git a/tests/first_merge_check b/tests/first_merge_check deleted file mode 100755 index 6ac8396a..00000000 --- a/tests/first_merge_check +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -PROCESS_HKL=$1 - -cat > first_merge_check.stream << EOF -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 -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 -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 - -cat > first_merge_check_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 -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 -if [ $? -ne 0 ]; then - exit 1 -fi -rm -f first_merge_check.stream first_merge_check.hkl first_merge_check_ans.hkl -exit 0 diff --git a/tests/fourth_merge_check b/tests/fourth_merge_check deleted file mode 100755 index 67c87e86..00000000 --- a/tests/fourth_merge_check +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -PROCESS_HKL=$1 - -cat > fourth_merge_check.stream << EOF -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 -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 ----- -EOF - -cat > fourth_merge_check_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 -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 -if [ $? -ne 0 ]; then - exit 1 -fi -rm -f fourth_merge_check.stream fourth_merge_check.hkl fourth_merge_check_ans.hkl -exit 0 diff --git a/tests/process_hkl_check_1 b/tests/process_hkl_check_1 new file mode 100755 index 00000000..2d65c0a9 --- /dev/null +++ b/tests/process_hkl_check_1 @@ -0,0 +1,57 @@ +#!/bin/sh + +PROCESS_HKL=$1 + +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 ----- +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 +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 +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 + +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 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' 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 process_hkl_check_1.stream process_hkl_check_1.hkl process_hkl_check_1_ans.hkl +exit 0 diff --git a/tests/process_hkl_check_2 b/tests/process_hkl_check_2 new file mode 100755 index 00000000..b4d85fb4 --- /dev/null +++ b/tests/process_hkl_check_2 @@ -0,0 +1,57 @@ +#!/bin/sh + +PROCESS_HKL=$1 + +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 ----- +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 +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 +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 + +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 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' 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 process_hkl_check_2.stream process_hkl_check_2.hkl process_hkl_check_2_ans.hkl +exit 0 diff --git a/tests/process_hkl_check_3 b/tests/process_hkl_check_3 new file mode 100755 index 00000000..cef7996c --- /dev/null +++ b/tests/process_hkl_check_3 @@ -0,0 +1,72 @@ +#!/bin/sh + +PROCESS_HKL=$1 + +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 ----- +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 +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 +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 ----- + +----- 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 +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 ----- +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 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' 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 process_hkl_check_3.stream process_hkl_check_3.hkl process_hkl_check_3_ans.hkl +exit 0 diff --git a/tests/process_hkl_check_4 b/tests/process_hkl_check_4 new file mode 100755 index 00000000..aa36f112 --- /dev/null +++ b/tests/process_hkl_check_4 @@ -0,0 +1,41 @@ +#!/bin/sh + +PROCESS_HKL=$1 + +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 ----- +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 +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 ----- +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 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' 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 process_hkl_check_4.stream process_hkl_check_4.hkl process_hkl_check_4_ans.hkl +exit 0 diff --git a/tests/second_merge_check b/tests/second_merge_check deleted file mode 100755 index 3ef9fc50..00000000 --- a/tests/second_merge_check +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -PROCESS_HKL=$1 - -cat > second_merge_check.stream << EOF -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 -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 -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 - -cat > second_merge_check_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 -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 -if [ $? -ne 0 ]; then - exit 1 -fi -rm -f second_merge_check.stream second_merge_check.hkl second_merge_check_ans.hkl -exit 0 diff --git a/tests/third_merge_check b/tests/third_merge_check deleted file mode 100755 index 9ebb9f85..00000000 --- a/tests/third_merge_check +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh - -PROCESS_HKL=$1 - -cat > third_merge_check.stream << EOF -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 -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 -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 ----- - ------ 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 -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 ----- -EOF - -cat > third_merge_check_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 -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 -if [ $? -ne 0 ]; then - exit 1 -fi -rm -f third_merge_check.stream third_merge_check.hkl third_merge_check_ans.hkl -exit 0 -- cgit v1.2.3