From 688fa7d2abd0a30e011923e58f9df6f94c7ab569 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Tue, 30 Oct 2012 19:40:50 +0000
Subject: [PATCH] Task #3634: Moved FinalMetaDataGatherer to separate
RTCP/MetaDataGatherer package to prevent OTDB dependency in Storage.
---
.gitattributes | 4 +++-
CMake/LofarPackageList.cmake | 1 +
RTCP/CMakeLists.txt | 1 +
RTCP/MetaDataGatherer/CMakeLists.txt | 8 ++++++++
RTCP/MetaDataGatherer/src/CMakeLists.txt | 12 ++++++++++++
.../src/FinalMetaDataGatherer.cc | 2 +-
.../src/FinalMetaDataGatherer.log_prop | 0
RTCP/Storage/CMakeLists.txt | 2 +-
RTCP/Storage/src/CMakeLists.txt | 2 --
9 files changed, 27 insertions(+), 5 deletions(-)
create mode 100644 RTCP/MetaDataGatherer/CMakeLists.txt
create mode 100644 RTCP/MetaDataGatherer/src/CMakeLists.txt
rename RTCP/{Storage => MetaDataGatherer}/src/FinalMetaDataGatherer.cc (99%)
rename RTCP/{Storage => MetaDataGatherer}/src/FinalMetaDataGatherer.log_prop (100%)
diff --git a/.gitattributes b/.gitattributes
index 148a5f39f0e..d5fb19222ef 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3619,6 +3619,9 @@ RTCP/LofarStMan/include/LofarStMan/CMakeLists.txt -text
RTCP/LofarStMan/src/CMakeLists.txt -text
RTCP/LofarStMan/src/makeFLAGwritable -text
RTCP/LofarStMan/test/CMakeLists.txt -text
+RTCP/MetaDataGatherer/CMakeLists.txt -text
+RTCP/MetaDataGatherer/src/CMakeLists.txt -text
+RTCP/MetaDataGatherer/src/FinalMetaDataGatherer.cc -text
RTCP/RTCPTools/src/cexec-udp-copy -text
RTCP/RTCPTools/src/tbb-crc-test.cc -text
RTCP/Run/CMakeLists.txt -text
@@ -3685,7 +3688,6 @@ RTCP/Storage/include/Storage/TBB_StaticMapping.h -text
RTCP/Storage/include/Storage/TBB_Writer.h -text
RTCP/Storage/src/ExitOnClosedStdin.cc -text
RTCP/Storage/src/FastFileStream.cc -text
-RTCP/Storage/src/FinalMetaDataGatherer.cc -text
RTCP/Storage/src/Format.cc -text
RTCP/Storage/src/MSWriterCorrelated.cc -text
RTCP/Storage/src/MSWriterDAL.cc -text
diff --git a/CMake/LofarPackageList.cmake b/CMake/LofarPackageList.cmake
index d383afda24f..3b7d1abc9d9 100644
--- a/CMake/LofarPackageList.cmake
+++ b/CMake/LofarPackageList.cmake
@@ -108,6 +108,7 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
set(Storage_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Storage)
set(Run_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Run)
set(LofarStMan_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/LofarStMan)
+ set(MetaDataGatherer_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/MetaDataGatherer)
set(OTDB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTDB)
set(OTB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTB)
set(Beaminfo_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/Beaminfo)
diff --git a/RTCP/CMakeLists.txt b/RTCP/CMakeLists.txt
index 87988843b57..8e2e58a0874 100644
--- a/RTCP/CMakeLists.txt
+++ b/RTCP/CMakeLists.txt
@@ -7,3 +7,4 @@ lofar_add_package(IONProc) # BlueGene: I/O Node Processing applications
lofar_add_package(Storage) # Stores correlator output in MeasurmentSets
lofar_add_package(Run) # Run scripts to start RTCP components
lofar_add_package(LofarStMan)# Storage Manager for the main table of a LOFAR MS
+lofar_add_package(MetaDataGatherer)# Pulls in meta data from OTDB etc
diff --git a/RTCP/MetaDataGatherer/CMakeLists.txt b/RTCP/MetaDataGatherer/CMakeLists.txt
new file mode 100644
index 00000000000..177ce0e4793
--- /dev/null
+++ b/RTCP/MetaDataGatherer/CMakeLists.txt
@@ -0,0 +1,8 @@
+# $Id: CMakeLists.txt 22563 2012-10-30 18:50:15Z mol $
+
+lofar_package(MetaDataGatherer 1.0 DEPENDS Common Stream OTDB Interface Storage)
+
+include(LofarFindPackage)
+lofar_find_package(Casacore COMPONENTS casa ms tables REQUIRED)
+
+add_subdirectory(src)
diff --git a/RTCP/MetaDataGatherer/src/CMakeLists.txt b/RTCP/MetaDataGatherer/src/CMakeLists.txt
new file mode 100644
index 00000000000..af98d61a4b3
--- /dev/null
+++ b/RTCP/MetaDataGatherer/src/CMakeLists.txt
@@ -0,0 +1,12 @@
+# $Id: CMakeLists.txt 22530 2012-10-26 13:11:29Z mol $
+
+include(LofarPackageVersion)
+
+lofar_add_library(metadatagatherer
+ Package__Version.cc)
+
+install(FILES
+ FinalMetaDataGatherer.log_prop
+ DESTINATION etc)
+
+lofar_add_bin_program(FinalMetaDataGatherer FinalMetaDataGatherer.cc)
diff --git a/RTCP/Storage/src/FinalMetaDataGatherer.cc b/RTCP/MetaDataGatherer/src/FinalMetaDataGatherer.cc
similarity index 99%
rename from RTCP/Storage/src/FinalMetaDataGatherer.cc
rename to RTCP/MetaDataGatherer/src/FinalMetaDataGatherer.cc
index 777f2064089..c23d9adf861 100644
--- a/RTCP/Storage/src/FinalMetaDataGatherer.cc
+++ b/RTCP/MetaDataGatherer/src/FinalMetaDataGatherer.cc
@@ -70,7 +70,7 @@ MVEpoch toCasaTime (const string& time)
ASSERT(!time.empty());
// e.g. 2011-Mar-19 21:17:06.514000
- Double casaTime; // casacore MVEpoch time to be returned
+ Double casaTime = 0.0; // casacore MVEpoch time to be returned
Quantity result(casaTime, "s"); // set quantity unit to seconds
MVTime::read(result, time);
return result;
diff --git a/RTCP/Storage/src/FinalMetaDataGatherer.log_prop b/RTCP/MetaDataGatherer/src/FinalMetaDataGatherer.log_prop
similarity index 100%
rename from RTCP/Storage/src/FinalMetaDataGatherer.log_prop
rename to RTCP/MetaDataGatherer/src/FinalMetaDataGatherer.log_prop
diff --git a/RTCP/Storage/CMakeLists.txt b/RTCP/Storage/CMakeLists.txt
index 72305e02b71..1ec905111dc 100644
--- a/RTCP/Storage/CMakeLists.txt
+++ b/RTCP/Storage/CMakeLists.txt
@@ -1,6 +1,6 @@
# $Id$
-lofar_package(Storage 1.0 DEPENDS Common ApplCommon Interface MSLofar LofarStMan OTDB)
+lofar_package(Storage 1.0 DEPENDS Common ApplCommon Stream Interface MSLofar LofarStMan)
include(LofarFindPackage)
lofar_find_package(Casacore COMPONENTS casa ms tables REQUIRED)
diff --git a/RTCP/Storage/src/CMakeLists.txt b/RTCP/Storage/src/CMakeLists.txt
index a0de7ff6740..8a4125d86d0 100644
--- a/RTCP/Storage/src/CMakeLists.txt
+++ b/RTCP/Storage/src/CMakeLists.txt
@@ -25,13 +25,11 @@ install(PROGRAMS
DESTINATION bin)
install(FILES
- FinalMetaDataGatherer.log_prop
Storage_main.log_prop
TBB_Writer_main.log_prop
DESTINATION etc)
lofar_add_bin_program(Storage_main Storage_main.cc)
-lofar_add_bin_program(FinalMetaDataGatherer FinalMetaDataGatherer.cc)
lofar_add_bin_program(createHeaders createHeaders.cc)
lofar_add_bin_program(plotMS plotMS.cc)
lofar_add_bin_program(versionstorage versionstorage.cc)
--
GitLab