From 402865ba8f31d37ecd2916dbbc7a37e35a3f16bb Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Fri, 13 Dec 2013 15:45:32 +0000
Subject: [PATCH] Task #2669: Fixed typo, and added
 Cobalt.OutputProc.StaticMetaDataDirectory to default parset additions

---
 .../etc/parset-additions.d/default/OutputProc.parset.in        | 3 +++
 RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.cc             | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/OutputProc.parset.in b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/OutputProc.parset.in
index 5720a66b34a..9dcb27ff15d 100644
--- a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/OutputProc.parset.in
+++ b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/OutputProc.parset.in
@@ -10,3 +10,6 @@ Cobalt.OutputProc.sshPrivateKey =
 # which thus needs to be found in $PATH after login.
 Cobalt.OutputProc.executable = @CMAKE_INSTALL_PREFIX@/bin/outputProc
 
+# The directory where OutputProc can find the StaticMetaData
+Cobalt.OutputProc.StaticMetaDataDirectory = @CMAKE_INSTALL_PREFIX@/etc/StaticMetaData
+
diff --git a/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.cc b/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.cc
index 33c374453f5..21fd738f60e 100644
--- a/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.cc
+++ b/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.cc
@@ -194,7 +194,7 @@ namespace LOFAR
           }
           // Add static meta data path from parset at the front for regression testing.
           string staticMetaDataDir =
-            itsPS.isDefined("Cobalt.OutputProc.StaticMetaDirectory")
+            itsPS.isDefined("Cobalt.OutputProc.StaticMetaDataDirectory")
             ? itsPS.getString("Cobalt.OutputProc.StaticMetaDataDirectory", "")
             : itsPS.getString("OLAP.Storage.StaticMetaDataDirectory", "");
           if (!staticMetaDataDir.empty()) {
-- 
GitLab