From ce577b7d33d29febb79d5dc3f23a65629709b9e2 Mon Sep 17 00:00:00 2001
From: Bram Veenboer <bram.veenboer@gmail.com>
Date: Thu, 15 Apr 2021 13:29:11 +0000
Subject: [PATCH] COB-184: Move tMultipleBeamFormers from LMM to Commensal
---
SubSystems/Online_Cobalt/test/CMakeLists.txt | 1 -
SubSystems/Online_Cobalt/test/Commensal/CMakeLists.txt | 1 +
.../test/{LMM => Commensal}/tMultipleBeamFormers.run | 2 +-
.../test/{LMM => Commensal}/tMultipleBeamFormers.sh | 0
.../test/{LMM => Commensal}/tMultipleBeamFormers_bf1.parset | 0
.../test/{LMM => Commensal}/tMultipleBeamFormers_bf2.parset | 0
.../test/{LMM => Commensal}/tMultipleBeamFormers_bf3.parset | 0
.../test/{LMM => Commensal}/tMultipleBeamFormers_bf4.parset | 0
.../{LMM => Commensal}/tMultipleBeamFormers_combined.parset | 0
.../test/{LMM => Commensal}/tMultipleBeamFormers_common.parset | 0
.../examine.py => Commensal/tMultipleBeamFormers_examine.py} | 0
11 files changed, 2 insertions(+), 2 deletions(-)
rename SubSystems/Online_Cobalt/test/{LMM => Commensal}/tMultipleBeamFormers.run (99%)
rename SubSystems/Online_Cobalt/test/{LMM => Commensal}/tMultipleBeamFormers.sh (100%)
rename SubSystems/Online_Cobalt/test/{LMM => Commensal}/tMultipleBeamFormers_bf1.parset (100%)
rename SubSystems/Online_Cobalt/test/{LMM => Commensal}/tMultipleBeamFormers_bf2.parset (100%)
rename SubSystems/Online_Cobalt/test/{LMM => Commensal}/tMultipleBeamFormers_bf3.parset (100%)
rename SubSystems/Online_Cobalt/test/{LMM => Commensal}/tMultipleBeamFormers_bf4.parset (100%)
rename SubSystems/Online_Cobalt/test/{LMM => Commensal}/tMultipleBeamFormers_combined.parset (100%)
rename SubSystems/Online_Cobalt/test/{LMM => Commensal}/tMultipleBeamFormers_common.parset (100%)
rename SubSystems/Online_Cobalt/test/{LMM/examine.py => Commensal/tMultipleBeamFormers_examine.py} (100%)
diff --git a/SubSystems/Online_Cobalt/test/CMakeLists.txt b/SubSystems/Online_Cobalt/test/CMakeLists.txt
index 2a1b5487760..9621a0a8360 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 011ae875a2f..ee0116bc9d9 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 98ca3123358..254676e64aa 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
--
GitLab