diff --git a/SubSystems/Online_Cobalt/test/CMakeLists.txt b/SubSystems/Online_Cobalt/test/CMakeLists.txt index 2a1b548776030b7705aa00906106f3fd9f219fec..9621a0a83603c6de63bbea85bcbce55ed4512277 100644 --- a/SubSystems/Online_Cobalt/test/CMakeLists.txt +++ b/SubSystems/Online_Cobalt/test/CMakeLists.txt @@ -30,4 +30,3 @@ add_subdirectory(Correlator) add_subdirectory(Beamformer) add_subdirectory(Commensal) add_subdirectory(RSPRaw) -add_subdirectory(LMM) \ No newline at end of file diff --git a/SubSystems/Online_Cobalt/test/Commensal/CMakeLists.txt b/SubSystems/Online_Cobalt/test/Commensal/CMakeLists.txt index 011ae875a2ff19fe208221798b78f4dd79d2da8d..ee0116bc9d9847dc98415ffcebfb5270bf4f1194 100644 --- a/SubSystems/Online_Cobalt/test/Commensal/CMakeLists.txt +++ b/SubSystems/Online_Cobalt/test/Commensal/CMakeLists.txt @@ -4,6 +4,7 @@ include(LofarCTest) set(_tests tCommensal_3sec_2st_3sb + tMultipleBeamFormers ) foreach(_test ${_tests}) diff --git a/SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers.run b/SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers.run similarity index 99% rename from SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers.run rename to SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers.run index 98ca31233589142b1a35ec66794df3ce1aeee930..254676e64aa4f97164640e684c413442738b245a 100755 --- a/SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers.run +++ b/SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers.run @@ -97,7 +97,7 @@ fi runObservation.sh -A -F -l 1 ${BFLMM} # Examine the output - EXAMINE=${srcdir}/examine.py + EXAMINE="${srcdir}/${TESTNAME}_examine.py" OUT_REF_BF1=${TESTNAME}_ref_bf1.out OUT_REF_BF2=${TESTNAME}_ref_bf2.out OUT_REF_BF3=${TESTNAME}_ref_bf3.out diff --git a/SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers.sh b/SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers.sh similarity index 100% rename from SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers.sh rename to SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers.sh diff --git a/SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers_bf1.parset b/SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers_bf1.parset similarity index 100% rename from SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers_bf1.parset rename to SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers_bf1.parset diff --git a/SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers_bf2.parset b/SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers_bf2.parset similarity index 100% rename from SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers_bf2.parset rename to SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers_bf2.parset diff --git a/SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers_bf3.parset b/SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers_bf3.parset similarity index 100% rename from SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers_bf3.parset rename to SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers_bf3.parset diff --git a/SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers_bf4.parset b/SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers_bf4.parset similarity index 100% rename from SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers_bf4.parset rename to SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers_bf4.parset diff --git a/SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers_combined.parset b/SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers_combined.parset similarity index 100% rename from SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers_combined.parset rename to SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers_combined.parset diff --git a/SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers_common.parset b/SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers_common.parset similarity index 100% rename from SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers_common.parset rename to SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers_common.parset diff --git a/SubSystems/Online_Cobalt/test/LMM/examine.py b/SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers_examine.py similarity index 100% rename from SubSystems/Online_Cobalt/test/LMM/examine.py rename to SubSystems/Online_Cobalt/test/Commensal/tMultipleBeamFormers_examine.py