From 26bca4010a92408d1c06ba82bf8224f594b6fd50 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Tue, 3 Feb 2015 15:49:40 +0000
Subject: [PATCH] Task #7362: Retrieve and store momID from parset
---
RTCP/Cobalt/CoInterface/src/Parset.cc | 1 +
RTCP/Cobalt/CoInterface/src/Parset.h | 5 +++++
RTCP/Cobalt/CoInterface/test/tParset.cc | 6 ++++++
3 files changed, 12 insertions(+)
diff --git a/RTCP/Cobalt/CoInterface/src/Parset.cc b/RTCP/Cobalt/CoInterface/src/Parset.cc
index 911a06981a7..316a4a32e0d 100644
--- a/RTCP/Cobalt/CoInterface/src/Parset.cc
+++ b/RTCP/Cobalt/CoInterface/src/Parset.cc
@@ -321,6 +321,7 @@ namespace LOFAR
// Generic information
settings.realTime = getBool("Cobalt.realTime", false);
settings.observationID = getUint32("Observation.ObsID", 0);
+ settings.momID = getUint32("Observation.momID", 0);
settings.commandStream = getString("Cobalt.commandStream", "null:");
settings.startTime = getTime("Observation.startTime", "2013-01-01 00:00:00");
settings.stopTime = getTime("Observation.stopTime", "2013-01-01 00:01:00");
diff --git a/RTCP/Cobalt/CoInterface/src/Parset.h b/RTCP/Cobalt/CoInterface/src/Parset.h
index 8c9361fdbab..5c99148bee6 100644
--- a/RTCP/Cobalt/CoInterface/src/Parset.h
+++ b/RTCP/Cobalt/CoInterface/src/Parset.h
@@ -70,6 +70,11 @@ namespace LOFAR
// key: Observation.ObsID
unsigned observationID;
+ // The MoM observation number
+ //
+ // key: Observation.momID
+ unsigned momID;
+
// Command stream, or null: if not used
//
// key: Cobalt.commandStream
diff --git a/RTCP/Cobalt/CoInterface/test/tParset.cc b/RTCP/Cobalt/CoInterface/test/tParset.cc
index 1b80fa02e6c..a07e2c33f43 100644
--- a/RTCP/Cobalt/CoInterface/test/tParset.cc
+++ b/RTCP/Cobalt/CoInterface/test/tParset.cc
@@ -96,6 +96,12 @@ TEST(observationID) {
CHECK_EQUAL(12345U, ps.settings.observationID);
}
+TEST(momID) {
+ Parset ps = makeDefaultTestParset("Observation.momID", "12345");
+
+ CHECK_EQUAL(12345U, ps.settings.momID);
+}
+
TEST(startTime) {
Parset ps = makeDefaultTestParset("Observation.startTime", "2013-03-17 10:55:08");
--
GitLab