From d63f5d4c02163c14cfe7c944725466a8c45ad2ac Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Tue, 26 Nov 2019 13:13:21 +0100
Subject: [PATCH] SW-835: moved tbb files into seperate lofar package
TBBWriter.
---
CMake/LofarPackageList.cmake | 3 +-
RTCP/Cobalt/CMakeLists.txt | 1 +
RTCP/Cobalt/CoInterface/CMakeLists.txt | 1 +
RTCP/Cobalt/CoInterface/src/CMakeLists.txt | 1 +
.../src/CommonLofarAttributes.cc | 4 +--
.../src/CommonLofarAttributes.h | 0
RTCP/Cobalt/OutputProc/CMakeLists.txt | 1 -
RTCP/Cobalt/OutputProc/src/CMakeLists.txt | 12 +-------
RTCP/Cobalt/TBBWriter/CMakeLists.txt | 11 +++++++
RTCP/Cobalt/TBBWriter/src/CMakeLists.txt | 29 ++++++++++++++++++
.../src/TBB_Dipole.cc | 12 ++------
.../src/TBB_Dipole.h | 0
.../src/TBB_Frame.cc | 0
.../{OutputProc => TBBWriter}/src/TBB_Frame.h | 0
.../src/TBB_StaticMapping.cc | 0
.../src/TBB_StaticMapping.h | 0
.../src/TBB_Station.cc | 2 +-
.../src/TBB_Station.h | 0
.../src/TBB_StreamWriter.cc | 0
.../src/TBB_StreamWriter.h | 0
.../src/TBB_Writer.cc | 0
.../src/TBB_Writer.h | 0
.../src/TBB_Writer.log_prop | 0
.../src/TBB_Writer_main.cc | 10 +++---
RTCP/Cobalt/TBBWriter/test/CMakeLists.txt | 10 ++++++
.../test/tTBB_StaticMapping.cc | 0
.../TBBConnections.dat | 0
.../test/tTBB_StaticMapping.sh | 0
.../CS011-AntennaField.conf | 0
.../CS013-AntennaField.conf | 0
...0711T094130.000Z_tbb.h5.dump.reference.txt | 0
.../sb_20170711_094130_1310_sb99-100dupl.dat | Bin
.../tTBB_Writer-spectral-refout.raw | Bin
.../test/tTBB_Writer-spectral.parset | 0
.../test/tTBB_Writer-spectral.run | 0
.../test/tTBB_Writer-spectral.sh | 0
.../CS011-AntennaField.conf | 0
.../CS013-AntennaField.conf | 0
...19T110541.036Z_tbb.h5.selected-attribs.txt | 0
.../rw_20110719_110541_1110.dat | Bin
.../tTBB_Writer-transient-refout.raw | Bin
.../test/tTBB_Writer-transient.parset | 0
.../test/tTBB_Writer-transient.run | 0
.../test/tTBB_Writer-transient.sh | 0
44 files changed, 66 insertions(+), 31 deletions(-)
rename RTCP/Cobalt/{OutputProc => CoInterface}/src/CommonLofarAttributes.cc (98%)
rename RTCP/Cobalt/{OutputProc => CoInterface}/src/CommonLofarAttributes.h (100%)
create mode 100644 RTCP/Cobalt/TBBWriter/CMakeLists.txt
create mode 100644 RTCP/Cobalt/TBBWriter/src/CMakeLists.txt
rename RTCP/Cobalt/{OutputProc => TBBWriter}/src/TBB_Dipole.cc (98%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/src/TBB_Dipole.h (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/src/TBB_Frame.cc (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/src/TBB_Frame.h (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/src/TBB_StaticMapping.cc (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/src/TBB_StaticMapping.h (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/src/TBB_Station.cc (99%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/src/TBB_Station.h (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/src/TBB_StreamWriter.cc (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/src/TBB_StreamWriter.h (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/src/TBB_Writer.cc (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/src/TBB_Writer.h (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/src/TBB_Writer.log_prop (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/src/TBB_Writer_main.cc (98%)
create mode 100644 RTCP/Cobalt/TBBWriter/test/CMakeLists.txt
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_StaticMapping.cc (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_StaticMapping.in_1/TBBConnections.dat (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_StaticMapping.sh (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_Writer-spectral.in_1/CS011-AntennaField.conf (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_Writer-spectral.in_1/CS013-AntennaField.conf (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_Writer-spectral.in_1/L121213_CS013_D20170711T094130.000Z_tbb.h5.dump.reference.txt (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_Writer-spectral.in_1/sb_20170711_094130_1310_sb99-100dupl.dat (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_Writer-spectral.in_1/tTBB_Writer-spectral-refout.raw (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_Writer-spectral.parset (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_Writer-spectral.run (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_Writer-spectral.sh (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_Writer-transient.in_1/CS011-AntennaField.conf (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_Writer-transient.in_1/CS013-AntennaField.conf (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_Writer-transient.in_1/L121212_CS011_D20110719T110541.036Z_tbb.h5.selected-attribs.txt (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_Writer-transient.in_1/rw_20110719_110541_1110.dat (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_Writer-transient.in_1/tTBB_Writer-transient-refout.raw (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_Writer-transient.parset (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_Writer-transient.run (100%)
rename RTCP/Cobalt/{OutputProc => TBBWriter}/test/tTBB_Writer-transient.sh (100%)
diff --git a/CMake/LofarPackageList.cmake b/CMake/LofarPackageList.cmake
index ec6ada2f98a..fd3b7faae96 100644
--- a/CMake/LofarPackageList.cmake
+++ b/CMake/LofarPackageList.cmake
@@ -1,7 +1,7 @@
# - Create for each LOFAR package a variable containing the absolute path to
# its source directory.
#
-# Generated by gen_LofarPackageList_cmake.sh at Tue Jul 9 11:02:56 CEST 2019
+# Generated by gen_LofarPackageList_cmake.sh at di 26 nov 2019 10:54:07 CET
#
# ---- DO NOT EDIT ----
#
@@ -158,6 +158,7 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
set(CoInterface_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Cobalt/CoInterface)
set(CobaltTest_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Cobalt/CobaltTest)
set(BrokenAntennaInfo_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Cobalt/BrokenAntennaInfo)
+ set(TBBWriter_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Cobalt/TBBWriter)
set(OTDB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTDB)
set(OTB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTB)
set(OTDB_SQL_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTDB/sql)
diff --git a/RTCP/Cobalt/CMakeLists.txt b/RTCP/Cobalt/CMakeLists.txt
index 312d31f0a17..509eee0219a 100644
--- a/RTCP/Cobalt/CMakeLists.txt
+++ b/RTCP/Cobalt/CMakeLists.txt
@@ -6,3 +6,4 @@ lofar_add_package(GPUProc) # GPU computation applications
lofar_add_package(CoInterface) # CoInterface code between Cobalt packages
lofar_add_package(CobaltTest) # Overall Cobalt tests
lofar_add_package(BrokenAntennaInfo) # Library to provide broken antenna info
+lofar_add_package(TBBWriter)
diff --git a/RTCP/Cobalt/CoInterface/CMakeLists.txt b/RTCP/Cobalt/CoInterface/CMakeLists.txt
index d00426e896c..72bedfbf1af 100644
--- a/RTCP/Cobalt/CoInterface/CMakeLists.txt
+++ b/RTCP/Cobalt/CoInterface/CMakeLists.txt
@@ -8,6 +8,7 @@ lofar_find_package(UnitTest++)
lofar_find_package(OpenMP REQUIRED)
lofar_find_package(Valgrind)
lofar_find_package(LibNuma)
+lofar_find_package(DAL REQUIRED) # https://github.com/nextgen-astrodata/DAL
if(USE_VALGRIND)
add_definitions(-DUSE_VALGRIND)
diff --git a/RTCP/Cobalt/CoInterface/src/CMakeLists.txt b/RTCP/Cobalt/CoInterface/src/CMakeLists.txt
index f059bf193c9..cab5512bce6 100644
--- a/RTCP/Cobalt/CoInterface/src/CMakeLists.txt
+++ b/RTCP/Cobalt/CoInterface/src/CMakeLists.txt
@@ -12,6 +12,7 @@ lofar_add_library(cointerface
cpu_utils.cc
Allocator.cc
CorrelatedData.cc
+ CommonLofarAttributes.cc
BlockID.cc
BudgetTimer.cc
FinalMetaData.cc
diff --git a/RTCP/Cobalt/OutputProc/src/CommonLofarAttributes.cc b/RTCP/Cobalt/CoInterface/src/CommonLofarAttributes.cc
similarity index 98%
rename from RTCP/Cobalt/OutputProc/src/CommonLofarAttributes.cc
rename to RTCP/Cobalt/CoInterface/src/CommonLofarAttributes.cc
index 51b0c229835..f5a9a47d90d 100644
--- a/RTCP/Cobalt/OutputProc/src/CommonLofarAttributes.cc
+++ b/RTCP/Cobalt/CoInterface/src/CommonLofarAttributes.cc
@@ -29,7 +29,7 @@
#include <numeric>
#include <algorithm>
#include <boost/format.hpp>
-#include <OutputProc/Package__Version.h>
+#include <CoInterface/Package__Version.h>
using namespace std;
@@ -174,7 +174,7 @@ namespace LOFAR
}
file.targets().create(targets.size()).set(targets);
- file.systemVersion().value = OutputProcVersion::getVersion(); // LOFAR version
+ file.systemVersion().value = CoInterfaceVersion::getVersion(); // LOFAR version
//file.docName() has been set by DAL
//file.docVersion() has been set by DAL
diff --git a/RTCP/Cobalt/OutputProc/src/CommonLofarAttributes.h b/RTCP/Cobalt/CoInterface/src/CommonLofarAttributes.h
similarity index 100%
rename from RTCP/Cobalt/OutputProc/src/CommonLofarAttributes.h
rename to RTCP/Cobalt/CoInterface/src/CommonLofarAttributes.h
diff --git a/RTCP/Cobalt/OutputProc/CMakeLists.txt b/RTCP/Cobalt/OutputProc/CMakeLists.txt
index cf55cee64f4..8f16d1b5f8c 100644
--- a/RTCP/Cobalt/OutputProc/CMakeLists.txt
+++ b/RTCP/Cobalt/OutputProc/CMakeLists.txt
@@ -7,7 +7,6 @@ include(LofarFindPackage)
lofar_find_package(OpenMP REQUIRED)
lofar_find_package(Boost REQUIRED)
lofar_find_package(Casacore COMPONENTS casa ms tables REQUIRED)
-lofar_find_package(DAL REQUIRED) # https://github.com/nextgen-astrodata/DAL
# Skip explicit lofar_find_package(HDF5 REQUIRED) needed for casacore and DAL.
# On RHEL/CentOS 7 an explicit find HDF5 returns into OutputProc:
# -D_BSD_SOURCE -D_FORTIFY_SOURCE=2 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
diff --git a/RTCP/Cobalt/OutputProc/src/CMakeLists.txt b/RTCP/Cobalt/OutputProc/src/CMakeLists.txt
index c1e227fcdf3..e43aa9203bb 100644
--- a/RTCP/Cobalt/OutputProc/src/CMakeLists.txt
+++ b/RTCP/Cobalt/OutputProc/src/CMakeLists.txt
@@ -7,9 +7,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/include/${PACKAGE_NAME})
-#add_definitions(-DTBB_DUMP_RAW_STATION_FRAMES)
-
-lofar_add_library(outputproc
+lofar_add_library(outputproc
Package__Version.cc
FastFileStream.cc
GPUProcIO.cc
@@ -24,24 +22,16 @@ lofar_add_library(outputproc
OutputThread.cc
SubbandWriter.cc
RSPRawWriter.cc
- #TBB_Dipole.cc
- #TBB_Frame.cc
- #TBB_StaticMapping.cc
- #TBB_Station.cc
- #TBB_StreamWriter.cc
- #TBB_Writer.cc
)
lofar_add_sbin_scripts(gnuplotMS.sh)
install(FILES
outputProc.log_prop
- #TBB_Writer.log_prop
DESTINATION etc)
lofar_add_bin_program(outputProc outputProc.cc)
lofar_add_bin_program(versionoutputproc versionoutputproc.cc)
-#lofar_add_bin_program(TBB_Writer TBB_Writer_main.cc)
lofar_add_sbin_program(createHeaders createHeaders.cc)
lofar_add_sbin_program(plotMS plotMS.cc)
diff --git a/RTCP/Cobalt/TBBWriter/CMakeLists.txt b/RTCP/Cobalt/TBBWriter/CMakeLists.txt
new file mode 100644
index 00000000000..5bee0531a80
--- /dev/null
+++ b/RTCP/Cobalt/TBBWriter/CMakeLists.txt
@@ -0,0 +1,11 @@
+# $Id$
+
+lofar_package(TBBWriter 1.0 DEPENDS Common CoInterface)
+
+include(LofarFindPackage)
+
+#lofar_find_package(Boost REQUIRED)
+#lofar_find_package(DAL REQUIRED) # https://github.com/nextgen-astrodata/DAL
+
+add_subdirectory(src)
+add_subdirectory(test)
diff --git a/RTCP/Cobalt/TBBWriter/src/CMakeLists.txt b/RTCP/Cobalt/TBBWriter/src/CMakeLists.txt
new file mode 100644
index 00000000000..3a021b445ee
--- /dev/null
+++ b/RTCP/Cobalt/TBBWriter/src/CMakeLists.txt
@@ -0,0 +1,29 @@
+# $Id$
+
+include(LofarPackageVersion)
+
+# Create symbolic link to include directory.
+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}/include/${PACKAGE_NAME})
+
+#add_definitions(-DTBB_DUMP_RAW_STATION_FRAMES)
+
+lofar_add_library(TBB_WriterLib
+ Package__Version.cc
+ TBB_Dipole.cc
+ TBB_Frame.cc
+ TBB_StaticMapping.cc
+ TBB_Station.cc
+ TBB_StreamWriter.cc
+ TBB_Writer.cc
+)
+
+install(FILES
+ TBB_Writer.log_prop
+ DESTINATION etc)
+
+lofar_add_bin_program(versiontbbwriter versiontbbwriter.cc)
+lofar_add_bin_program(TBB_Writer TBB_Writer_main.cc)
+
+
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_Dipole.cc b/RTCP/Cobalt/TBBWriter/src/TBB_Dipole.cc
similarity index 98%
rename from RTCP/Cobalt/OutputProc/src/TBB_Dipole.cc
rename to RTCP/Cobalt/TBBWriter/src/TBB_Dipole.cc
index cfe774789c2..0c0a7b6b51d 100644
--- a/RTCP/Cobalt/OutputProc/src/TBB_Dipole.cc
+++ b/RTCP/Cobalt/TBBWriter/src/TBB_Dipole.cc
@@ -682,18 +682,10 @@ namespace LOFAR
<< " samples will be discarded!");
}
- /**
- * I know, I know. These two casts are not good. I tried to use a
- * union for a std::complex< int16_t > type but C++ would not let me.
- * Next best thing is a union of int16_t[] and int16_t[][2]. And hence
- * the weird casting.
- */
try
{
- currentSubBand.dataSet->set1D(offset,
- reinterpret_cast< std::complex< int16_t > * >(
- const_cast< int16_t * >(&(frame.payload.spectralData[0][0]))),
- numberOfSamplesToBeStored, 0);
+ const int16_t *spectralDataPtr = &(frame.payload.spectralData[0][0]);
+ currentSubBand.dataSet->set1D(offset, spectralDataPtr, numberOfSamplesToBeStored, 0);
}
catch(std::exception& ex)
{
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_Dipole.h b/RTCP/Cobalt/TBBWriter/src/TBB_Dipole.h
similarity index 100%
rename from RTCP/Cobalt/OutputProc/src/TBB_Dipole.h
rename to RTCP/Cobalt/TBBWriter/src/TBB_Dipole.h
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_Frame.cc b/RTCP/Cobalt/TBBWriter/src/TBB_Frame.cc
similarity index 100%
rename from RTCP/Cobalt/OutputProc/src/TBB_Frame.cc
rename to RTCP/Cobalt/TBBWriter/src/TBB_Frame.cc
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_Frame.h b/RTCP/Cobalt/TBBWriter/src/TBB_Frame.h
similarity index 100%
rename from RTCP/Cobalt/OutputProc/src/TBB_Frame.h
rename to RTCP/Cobalt/TBBWriter/src/TBB_Frame.h
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.cc b/RTCP/Cobalt/TBBWriter/src/TBB_StaticMapping.cc
similarity index 100%
rename from RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.cc
rename to RTCP/Cobalt/TBBWriter/src/TBB_StaticMapping.cc
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.h b/RTCP/Cobalt/TBBWriter/src/TBB_StaticMapping.h
similarity index 100%
rename from RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.h
rename to RTCP/Cobalt/TBBWriter/src/TBB_StaticMapping.h
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_Station.cc b/RTCP/Cobalt/TBBWriter/src/TBB_Station.cc
similarity index 99%
rename from RTCP/Cobalt/OutputProc/src/TBB_Station.cc
rename to RTCP/Cobalt/TBBWriter/src/TBB_Station.cc
index 64f89e52dd7..576a2114530 100644
--- a/RTCP/Cobalt/OutputProc/src/TBB_Station.cc
+++ b/RTCP/Cobalt/TBBWriter/src/TBB_Station.cc
@@ -29,7 +29,7 @@
#include <Common/SystemUtil.h>
#include <Common/LofarLogger.h>
#include <Common/LofarConstants.h>
-#include "CommonLofarAttributes.h"
+#include <CoInterface/CommonLofarAttributes.h>
namespace LOFAR
{
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_Station.h b/RTCP/Cobalt/TBBWriter/src/TBB_Station.h
similarity index 100%
rename from RTCP/Cobalt/OutputProc/src/TBB_Station.h
rename to RTCP/Cobalt/TBBWriter/src/TBB_Station.h
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_StreamWriter.cc b/RTCP/Cobalt/TBBWriter/src/TBB_StreamWriter.cc
similarity index 100%
rename from RTCP/Cobalt/OutputProc/src/TBB_StreamWriter.cc
rename to RTCP/Cobalt/TBBWriter/src/TBB_StreamWriter.cc
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_StreamWriter.h b/RTCP/Cobalt/TBBWriter/src/TBB_StreamWriter.h
similarity index 100%
rename from RTCP/Cobalt/OutputProc/src/TBB_StreamWriter.h
rename to RTCP/Cobalt/TBBWriter/src/TBB_StreamWriter.h
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_Writer.cc b/RTCP/Cobalt/TBBWriter/src/TBB_Writer.cc
similarity index 100%
rename from RTCP/Cobalt/OutputProc/src/TBB_Writer.cc
rename to RTCP/Cobalt/TBBWriter/src/TBB_Writer.cc
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_Writer.h b/RTCP/Cobalt/TBBWriter/src/TBB_Writer.h
similarity index 100%
rename from RTCP/Cobalt/OutputProc/src/TBB_Writer.h
rename to RTCP/Cobalt/TBBWriter/src/TBB_Writer.h
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_Writer.log_prop b/RTCP/Cobalt/TBBWriter/src/TBB_Writer.log_prop
similarity index 100%
rename from RTCP/Cobalt/OutputProc/src/TBB_Writer.log_prop
rename to RTCP/Cobalt/TBBWriter/src/TBB_Writer.log_prop
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_Writer_main.cc b/RTCP/Cobalt/TBBWriter/src/TBB_Writer_main.cc
similarity index 98%
rename from RTCP/Cobalt/OutputProc/src/TBB_Writer_main.cc
rename to RTCP/Cobalt/TBBWriter/src/TBB_Writer_main.cc
index 17658126b4a..ff2a37d3cc3 100644
--- a/RTCP/Cobalt/OutputProc/src/TBB_Writer_main.cc
+++ b/RTCP/Cobalt/TBBWriter/src/TBB_Writer_main.cc
@@ -41,7 +41,7 @@
#include <Common/IOPriority.h>
#include <ApplCommon/StationConfig.h>
#include <ApplCommon/AntField.h>
-#include <OutputProc/Package__Version.h>
+#include <TBBWriter/Package__Version.h>
#include <dal/lofar/StationNames.h> // https://github.com/nextgen-astrodata/DAL
@@ -307,8 +307,8 @@ static int isAccessibleDirname(const string& dirname)
static void printUsage(const char* progname)
{
cout << "TBB_Writer version: "
- << LOFAR::OutputProcVersion::getVersion()
- << " r" << LOFAR::OutputProcVersion::getRevision()
+ << LOFAR::TBBWriterVersion::getVersion()
+ << " r" << LOFAR::TBBWriterVersion::getRevision()
<< "\nWrite incoming LOFAR Transient Buffer Board (TBB) data with meta data to storage in HDF5 format.\n"
<< "Usage: " << progname << " -s parsets/L12345.parset [OPTION]...\n\n"
<< "Options:\n"
@@ -498,8 +498,8 @@ int main(int argc, char* argv[])
}
INIT_LOGGER("TBB_Writer");
- LOG_INFO("TBB_Writer version " + LOFAR::OutputProcVersion::getVersion() +
- " r" + LOFAR::OutputProcVersion::getRevision());
+ LOG_INFO("TBB_Writer version " + LOFAR::TBBWriterVersion::getVersion() +
+ " r" + LOFAR::TBBWriterVersion::getRevision());
setTermSigsHandler();
diff --git a/RTCP/Cobalt/TBBWriter/test/CMakeLists.txt b/RTCP/Cobalt/TBBWriter/test/CMakeLists.txt
new file mode 100644
index 00000000000..cbc7e4a3983
--- /dev/null
+++ b/RTCP/Cobalt/TBBWriter/test/CMakeLists.txt
@@ -0,0 +1,10 @@
+# $Id$
+
+include(LofarCTest)
+
+IF(BUILD_TESTING)
+ lofar_add_test(tTBB_StaticMapping tTBB_StaticMapping.cc)
+ lofar_add_test(tTBB_Writer-transient)
+ lofar_add_test(tTBB_Writer-spectral)
+ENDIF(BUILD_TESTING)
+
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_StaticMapping.cc b/RTCP/Cobalt/TBBWriter/test/tTBB_StaticMapping.cc
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_StaticMapping.cc
rename to RTCP/Cobalt/TBBWriter/test/tTBB_StaticMapping.cc
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_StaticMapping.in_1/TBBConnections.dat b/RTCP/Cobalt/TBBWriter/test/tTBB_StaticMapping.in_1/TBBConnections.dat
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_StaticMapping.in_1/TBBConnections.dat
rename to RTCP/Cobalt/TBBWriter/test/tTBB_StaticMapping.in_1/TBBConnections.dat
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_StaticMapping.sh b/RTCP/Cobalt/TBBWriter/test/tTBB_StaticMapping.sh
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_StaticMapping.sh
rename to RTCP/Cobalt/TBBWriter/test/tTBB_StaticMapping.sh
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.in_1/CS011-AntennaField.conf b/RTCP/Cobalt/TBBWriter/test/tTBB_Writer-spectral.in_1/CS011-AntennaField.conf
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.in_1/CS011-AntennaField.conf
rename to RTCP/Cobalt/TBBWriter/test/tTBB_Writer-spectral.in_1/CS011-AntennaField.conf
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.in_1/CS013-AntennaField.conf b/RTCP/Cobalt/TBBWriter/test/tTBB_Writer-spectral.in_1/CS013-AntennaField.conf
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.in_1/CS013-AntennaField.conf
rename to RTCP/Cobalt/TBBWriter/test/tTBB_Writer-spectral.in_1/CS013-AntennaField.conf
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.in_1/L121213_CS013_D20170711T094130.000Z_tbb.h5.dump.reference.txt b/RTCP/Cobalt/TBBWriter/test/tTBB_Writer-spectral.in_1/L121213_CS013_D20170711T094130.000Z_tbb.h5.dump.reference.txt
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.in_1/L121213_CS013_D20170711T094130.000Z_tbb.h5.dump.reference.txt
rename to RTCP/Cobalt/TBBWriter/test/tTBB_Writer-spectral.in_1/L121213_CS013_D20170711T094130.000Z_tbb.h5.dump.reference.txt
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.in_1/sb_20170711_094130_1310_sb99-100dupl.dat b/RTCP/Cobalt/TBBWriter/test/tTBB_Writer-spectral.in_1/sb_20170711_094130_1310_sb99-100dupl.dat
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.in_1/sb_20170711_094130_1310_sb99-100dupl.dat
rename to RTCP/Cobalt/TBBWriter/test/tTBB_Writer-spectral.in_1/sb_20170711_094130_1310_sb99-100dupl.dat
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.in_1/tTBB_Writer-spectral-refout.raw b/RTCP/Cobalt/TBBWriter/test/tTBB_Writer-spectral.in_1/tTBB_Writer-spectral-refout.raw
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.in_1/tTBB_Writer-spectral-refout.raw
rename to RTCP/Cobalt/TBBWriter/test/tTBB_Writer-spectral.in_1/tTBB_Writer-spectral-refout.raw
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.parset b/RTCP/Cobalt/TBBWriter/test/tTBB_Writer-spectral.parset
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.parset
rename to RTCP/Cobalt/TBBWriter/test/tTBB_Writer-spectral.parset
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.run b/RTCP/Cobalt/TBBWriter/test/tTBB_Writer-spectral.run
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.run
rename to RTCP/Cobalt/TBBWriter/test/tTBB_Writer-spectral.run
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.sh b/RTCP/Cobalt/TBBWriter/test/tTBB_Writer-spectral.sh
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.sh
rename to RTCP/Cobalt/TBBWriter/test/tTBB_Writer-spectral.sh
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.in_1/CS011-AntennaField.conf b/RTCP/Cobalt/TBBWriter/test/tTBB_Writer-transient.in_1/CS011-AntennaField.conf
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.in_1/CS011-AntennaField.conf
rename to RTCP/Cobalt/TBBWriter/test/tTBB_Writer-transient.in_1/CS011-AntennaField.conf
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.in_1/CS013-AntennaField.conf b/RTCP/Cobalt/TBBWriter/test/tTBB_Writer-transient.in_1/CS013-AntennaField.conf
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.in_1/CS013-AntennaField.conf
rename to RTCP/Cobalt/TBBWriter/test/tTBB_Writer-transient.in_1/CS013-AntennaField.conf
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.in_1/L121212_CS011_D20110719T110541.036Z_tbb.h5.selected-attribs.txt b/RTCP/Cobalt/TBBWriter/test/tTBB_Writer-transient.in_1/L121212_CS011_D20110719T110541.036Z_tbb.h5.selected-attribs.txt
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.in_1/L121212_CS011_D20110719T110541.036Z_tbb.h5.selected-attribs.txt
rename to RTCP/Cobalt/TBBWriter/test/tTBB_Writer-transient.in_1/L121212_CS011_D20110719T110541.036Z_tbb.h5.selected-attribs.txt
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.in_1/rw_20110719_110541_1110.dat b/RTCP/Cobalt/TBBWriter/test/tTBB_Writer-transient.in_1/rw_20110719_110541_1110.dat
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.in_1/rw_20110719_110541_1110.dat
rename to RTCP/Cobalt/TBBWriter/test/tTBB_Writer-transient.in_1/rw_20110719_110541_1110.dat
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.in_1/tTBB_Writer-transient-refout.raw b/RTCP/Cobalt/TBBWriter/test/tTBB_Writer-transient.in_1/tTBB_Writer-transient-refout.raw
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.in_1/tTBB_Writer-transient-refout.raw
rename to RTCP/Cobalt/TBBWriter/test/tTBB_Writer-transient.in_1/tTBB_Writer-transient-refout.raw
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.parset b/RTCP/Cobalt/TBBWriter/test/tTBB_Writer-transient.parset
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.parset
rename to RTCP/Cobalt/TBBWriter/test/tTBB_Writer-transient.parset
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.run b/RTCP/Cobalt/TBBWriter/test/tTBB_Writer-transient.run
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.run
rename to RTCP/Cobalt/TBBWriter/test/tTBB_Writer-transient.run
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.sh b/RTCP/Cobalt/TBBWriter/test/tTBB_Writer-transient.sh
similarity index 100%
rename from RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.sh
rename to RTCP/Cobalt/TBBWriter/test/tTBB_Writer-transient.sh
--
GitLab