diff --git a/LCS/MessageBus/include/MessageBus/Protocols/TaskFeedbackDataproducts.h b/LCS/MessageBus/include/MessageBus/Protocols/TaskFeedbackDataproducts.h
index 48d65c1a0a73b0977a7d5bf6c1a8bb6a5e397bca..e4e860244adfc3dcbc4ad0a570bcc27a703a5343 100644
--- a/LCS/MessageBus/include/MessageBus/Protocols/TaskFeedbackDataproducts.h
+++ b/LCS/MessageBus/include/MessageBus/Protocols/TaskFeedbackDataproducts.h
@@ -44,6 +44,10 @@ public:
// Human-readable summary describing this request
const std::string &summary,
+ // Identifiers for the context of this message
+ const std::string &momID,
+ const std::string &sasID,
+
// Payload: a parset containing the generated feedback
const ParameterSet &feedback
):
@@ -52,7 +56,9 @@ public:
forUser,
summary,
"lofar.task.feedback.dataproducts",
- "1.0.0")
+ "1.0.0",
+ momID,
+ sasID)
{
std::string buffer;
diff --git a/LCS/MessageBus/include/MessageBus/Protocols/TaskFeedbackProcessing.h b/LCS/MessageBus/include/MessageBus/Protocols/TaskFeedbackProcessing.h
index c09d630f95aeb704609b383fe61012ca77204efd..f8e8fa4fca568708eb6438b4719816e0a97eee09 100644
--- a/LCS/MessageBus/include/MessageBus/Protocols/TaskFeedbackProcessing.h
+++ b/LCS/MessageBus/include/MessageBus/Protocols/TaskFeedbackProcessing.h
@@ -44,6 +44,10 @@ public:
// Human-readable summary describing this request
const std::string &summary,
+ // Identifiers for the context of this message
+ const std::string &momID,
+ const std::string &sasID,
+
// Payload: a parset containing the generated feedback
const ParameterSet &feedback
):
@@ -52,7 +56,9 @@ public:
forUser,
summary,
"lofar.task.feedback.processing",
- "1.0.0")
+ "1.0.0",
+ momID,
+ sasID)
{
std::string buffer;
diff --git a/LCS/MessageBus/include/MessageBus/Protocols/TaskFeedbackStatus.h b/LCS/MessageBus/include/MessageBus/Protocols/TaskFeedbackStatus.h
index b94de7172a501d74c1bd59bb4afa0a7620d63bb4..02d6622841309d9a274c8756caaa7dfc1312cc30 100644
--- a/LCS/MessageBus/include/MessageBus/Protocols/TaskFeedbackStatus.h
+++ b/LCS/MessageBus/include/MessageBus/Protocols/TaskFeedbackStatus.h
@@ -45,6 +45,10 @@ public:
// Human-readable summary describing this request
const std::string &summary,
+ // Identifiers for the context of this message
+ const std::string &momID,
+ const std::string &sasID,
+
// Payload: a boolean indicating success
bool success
):
@@ -53,7 +57,9 @@ public:
forUser,
summary,
"lofar.task.feedback.status",
- "1.0.0")
+ "1.0.0",
+ momID,
+ sasID)
{
setXMLPayload(formatString(
"<task>\n"
diff --git a/RTCP/Cobalt/GPUProc/src/Storage/StorageProcess.cc b/RTCP/Cobalt/GPUProc/src/Storage/StorageProcess.cc
index 7f756ff25ba1901a035d7ec06398ddf62602ea7d..d381e8075c34e47c397f4bb190f002f26eb30185 100644
--- a/RTCP/Cobalt/GPUProc/src/Storage/StorageProcess.cc
+++ b/RTCP/Cobalt/GPUProc/src/Storage/StorageProcess.cc
@@ -80,6 +80,8 @@ namespace LOFAR
myName,
"",
str(boost::format("Feedback for Correlated Data, subband %s") % i),
+ str(format("%s") % itsParset.settings.momID),
+ str(format("%s") % itsParset.settings.observationID),
feedback.correlatedFeedback(i));
bus.send(msg);
@@ -93,6 +95,8 @@ namespace LOFAR
myName,
"",
str(boost::format("Feedback for Beamformed Data, file nr %s") % i),
+ str(format("%s") % itsParset.settings.momID),
+ str(format("%s") % itsParset.settings.observationID),
feedback.beamFormedFeedback(i));
bus.send(msg);
diff --git a/RTCP/Cobalt/GPUProc/src/rtcp.cc b/RTCP/Cobalt/GPUProc/src/rtcp.cc
index cd296975df3dcf600dcbf6ae6db9f761b9502c71..4bf0342c6a2460b48a5e3ad5115db943ee105e60 100644
--- a/RTCP/Cobalt/GPUProc/src/rtcp.cc
+++ b/RTCP/Cobalt/GPUProc/src/rtcp.cc
@@ -604,6 +604,8 @@ int main(int argc, char **argv)
"Cobalt/GPUProc/rtcp",
"",
"Processing feedback",
+ str(format("%s") % ps.settings.momID),
+ str(format("%s") % ps.settings.observationID),
fb.processingFeedback());
bus.send(msg);
diff --git a/RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh b/RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh
index 4d348d4be0afc8512aa202794ad83ae50dc1c585..3b3e6443873ab93e8b1e448cf007f55eb7079b1c 100755
--- a/RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh
+++ b/RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh
@@ -104,9 +104,7 @@ function sendback_status {
SUCCESS=0
fi
- send_status $SUCCESS
-
- return 1
+ send_status "$PARSET" $SUCCESS
}
#############################
diff --git a/RTCP/Cobalt/GPUProc/src/send_status.cc b/RTCP/Cobalt/GPUProc/src/send_status.cc
index 8034d68a8b04ceda4d97f8727ff83d0b054dbbe6..51e4d69cfd0d2ed2f91ebbc6841ed16bbd1f6dd7 100644
--- a/RTCP/Cobalt/GPUProc/src/send_status.cc
+++ b/RTCP/Cobalt/GPUProc/src/send_status.cc
@@ -20,6 +20,7 @@
#include <lofar_config.h>
+#include <CoInterface/Parset.h>
#include <MessageBus/MsgBus.h>
#include <MessageBus/Protocols/TaskFeedbackStatus.h>
@@ -28,12 +29,13 @@
#include <unistd.h>
using namespace LOFAR;
+using namespace LOFAR::Cobalt;
using namespace std;
using boost::format;
static void usage(const char *argv0)
{
- cerr << "Usage: " << argv0 << " success" << endl;
+ cerr << "Usage: " << argv0 << " parset success" << endl;
cerr << endl;
cerr << " -h: print this message" << endl;
}
@@ -58,13 +60,14 @@ int main(int argc, char **argv)
}
}
- // we expect a parset filename as an additional parameter
- if (optind >= argc) {
+ // we expect a parset filename and a success indicator as an additional parameter
+ if (optind + 1 >= argc) {
usage(argv[0]);
return EXIT_FAILURE;
}
- int success = atoi(argv[optind]);
+ Parset parset(argv[optind]);
+ int success = atoi(argv[optind+1]);
// send status feedback
ToBus bus("lofar.task.feedback.status");
@@ -73,6 +76,8 @@ int main(int argc, char **argv)
"Cobalt/GPUProc/sendStatus",
"",
"Status feedback",
+ str(format("%s") % parset.settings.momID),
+ str(format("%s") % parset.settings.observationID),
success);
bus.send(msg);
diff --git a/RTCP/Cobalt/OutputProc/src/GPUProcIO.cc b/RTCP/Cobalt/OutputProc/src/GPUProcIO.cc
index 514359372ea68d92d19766da3be918e61e8e2b8f..fffaff1bdfbb114bd984ce757e4f7f4b5e3a9f0e 100644
--- a/RTCP/Cobalt/OutputProc/src/GPUProcIO.cc
+++ b/RTCP/Cobalt/OutputProc/src/GPUProcIO.cc
@@ -262,6 +262,8 @@ bool process(Stream &controlStream, unsigned myRank)
myName,
"",
str(boost::format("Feedback for Correlated Data, subband %s") % subbandWriters[i]->streamNr()),
+ str(format("%s") % parset.settings.momID),
+ str(format("%s") % parset.settings.observationID),
subbandWriters[i]->feedbackLTA());
bus.send(msg);
@@ -272,6 +274,8 @@ bool process(Stream &controlStream, unsigned myRank)
myName,
"",
str(boost::format("Feedback for Beamformed Data, file nr %s") % tabWriters[i]->streamNr()),
+ str(format("%s") % parset.settings.momID),
+ str(format("%s") % parset.settings.observationID),
tabWriters[i]->feedbackLTA());
bus.send(msg);