From 3d0c0b095db5aec7cf0522d2b2c84a945317d69b Mon Sep 17 00:00:00 2001
From: Alexander van Amesfoort <amesfoort@astron.nl>
Date: Mon, 20 Apr 2015 17:02:15 +0000
Subject: [PATCH] Task #3185: minor comment, logger and header guard fixes in
OutputProc pkg
---
RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.cc | 5 +++--
RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.h | 6 +++---
RTCP/Cobalt/OutputProc/src/plotMS.cc | 6 +++---
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.cc b/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.cc
index 214b1ab2603..40310eac8fc 100644
--- a/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.cc
+++ b/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.cc
@@ -55,11 +55,12 @@ namespace Cobalt
while (ifile.getline(buf, parseBufSize).good()) {
string sbuf(buf);
- size_t pos = sbuf.find('#'); // line comments
+ size_t pos = sbuf.find('#'); // line comments
sbuf = sbuf.substr(0, pos);
vector<string> tokens(StringUtil::tokenize(sbuf, ws));
- // We expect 3 tokens (columns): stationName (0), board (1), destNode (2); ignore other tokens and "empty" lines.
+ // We expect 3 tokens (columns): stationName (0), board (1), destNode (2).
+ // Ignore other tokens and "empty" lines.
if (tokens.size() >= 3) {
itsMapping.insert(make_pair(tokens[2], make_pair(tokens[0], tokens[1])));
}
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.h b/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.h
index c371b0b6c23..d5e56bbc133 100644
--- a/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.h
+++ b/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.h
@@ -19,8 +19,8 @@
//#
//# $Id$
-#ifndef TBB_STATIC_MAPPING_H
-#define TBB_STATIC_MAPPING_H 1
+#ifndef TBBSTATICMAPPING_H
+#define TBBSTATICMAPPING_H 1
#include <string>
#include <vector>
@@ -59,5 +59,5 @@ namespace Cobalt
} // namespace Cobalt
} // namespace LOFAR
-#endif // TBB_CONNECTIONS_H
+#endif
diff --git a/RTCP/Cobalt/OutputProc/src/plotMS.cc b/RTCP/Cobalt/OutputProc/src/plotMS.cc
index 504da3040c1..916c3c028f7 100644
--- a/RTCP/Cobalt/OutputProc/src/plotMS.cc
+++ b/RTCP/Cobalt/OutputProc/src/plotMS.cc
@@ -1,5 +1,5 @@
//# plotMS.cc
-//# Copyright (C) 2011-2013 ASTRON (Netherlands Institute for Radio Astronomy)
+//# Copyright (C) 2011-2015 ASTRON (Netherlands Institute for Radio Astronomy)
//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
//#
//# This file is part of the LOFAR software suite.
@@ -82,13 +82,13 @@ static void usage(char *progname, int exitcode)
int main(int argc, char *argv[])
{
#if defined HAVE_LOG4CPLUS
- INIT_LOGGER(string(getenv("LOFARROOT") ? : ".") + "/etc/Storage.log_prop");
+ INIT_LOGGER(string(getenv("LOFARROOT") ? : ".") + "/etc/outputProc.log_prop");
#elif defined HAVE_LOG4CXX
#error LOG4CXX support is broken (nonsensical?) -- please fix this code if you want to use it
Context::initialize();
setLevel("Global",8);
#else
- INIT_LOGGER_WITH_SYSINFO(str(boost::format("Storage@%02d") % (argc > 1 ? atoi(argv[1]) : -1)));
+ INIT_LOGGER_WITH_SYSINFO(str(boost::format("outputProc@%02d") % (argc > 1 ? atoi(argv[1]) : -1)));
#endif
try {
--
GitLab