diff --git a/RTCP/Cobalt/CoInterface/src/LTAFeedback.cc b/RTCP/Cobalt/CoInterface/src/LTAFeedback.cc index d4d28ed3fe508f008d2b7869b69d3098d462f582..9ae322b05d50b06bf0362b23e86fdeb2b71f6984 100644 --- a/RTCP/Cobalt/CoInterface/src/LTAFeedback.cc +++ b/RTCP/Cobalt/CoInterface/src/LTAFeedback.cc @@ -44,9 +44,8 @@ namespace LOFAR std::string LTAFeedback::feedback_version(boost::str(boost::format("%02d.%02d.%02d") % major_version % minor_version % patch_number)); - LTAFeedback::LTAFeedback(const ObservationSettings &settings, ssize_t last_block): - settings(settings), - last_block(last_block) + LTAFeedback::LTAFeedback(const ObservationSettings &settings): + settings(settings) { } @@ -235,7 +234,7 @@ namespace LOFAR } - ParameterSet LTAFeedback::processingFeedback() const + ParameterSet LTAFeedback::processingFeedback(ssize_t last_block) const { ParameterSet ps; diff --git a/RTCP/Cobalt/CoInterface/src/LTAFeedback.h b/RTCP/Cobalt/CoInterface/src/LTAFeedback.h index 0d68f085c4e3f4c6bff7eaa9cec30e14b140c94b..2c21183ef48fca823f2ee1ebfaba00b2324c764d 100644 --- a/RTCP/Cobalt/CoInterface/src/LTAFeedback.h +++ b/RTCP/Cobalt/CoInterface/src/LTAFeedback.h @@ -33,8 +33,7 @@ namespace LOFAR class LTAFeedback { public: - // Generate feedback for these parset settings, given that "last_block" was the last block processed. - LTAFeedback(const ObservationSettings &settings, ssize_t last_block); + LTAFeedback(const ObservationSettings &settings); // Subset name of each correlated and beamFormed file, respectively. static std::string correlatedPrefix(size_t fileno); @@ -51,8 +50,10 @@ namespace LOFAR // \note Details about the meaning of the different meta-data parameters // can be found in the XSD that describes the Submission Information // Package (sip) for the LTA. + // + // "last_block" is the last block processed. // \see http://proposal.astron.nl/schemas/LTA-SIP.xsd - ParameterSet processingFeedback() const; + ParameterSet processingFeedback(ssize_t last_block) const; // Return the LTA feedback parameters. // \note Details about the meaning of the different meta-data parameters diff --git a/RTCP/Cobalt/GPUProc/src/rtcp.cc b/RTCP/Cobalt/GPUProc/src/rtcp.cc index fa8c5ca5b743fa6c6c480bc489c140a530596667..c44e86d0a46c45661458288b479e6463bdd5c2e3 100644 --- a/RTCP/Cobalt/GPUProc/src/rtcp.cc +++ b/RTCP/Cobalt/GPUProc/src/rtcp.cc @@ -622,7 +622,7 @@ int main(int argc, char **argv) // send processing feedback ToBus bus("otdb.task.feedback.processing", broker_feedback()); - LTAFeedback fb(ps.settings, last_block); + LTAFeedback fb(ps.settings); Protocols::TaskFeedbackProcessing msg( "Cobalt/GPUProc/rtcp", @@ -630,7 +630,7 @@ int main(int argc, char **argv) "Processing feedback", str(format("%s") % ps.settings.momID), str(format("%s") % ps.settings.observationID), - fb.processingFeedback()); + fb.processingFeedback(last_block)); bus.send(msg);