diff --git a/RTCP/Cobalt/OutputProc/src/MSWriter.h b/RTCP/Cobalt/OutputProc/src/MSWriter.h index cdc30492d462064f3371ad734e66100a70836fc9..0cf9257b77d97efffe124bbb523dd9d1f40614de 100644 --- a/RTCP/Cobalt/OutputProc/src/MSWriter.h +++ b/RTCP/Cobalt/OutputProc/src/MSWriter.h @@ -51,6 +51,7 @@ namespace LOFAR size_t itsNrBlocksWritten; size_t itsNrExpectedBlocks; ParameterSet itsConfiguration; + string itsConfigurationPrefix; }; diff --git a/RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.cc b/RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.cc index 711bc2f0a9c1f4c888367bfd19047641400a066b..5fbd6da2aa83ee586440ac39ae0153b94cf83815 100644 --- a/RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.cc +++ b/RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.cc @@ -58,6 +58,7 @@ namespace LOFAR // Add file-specific processing feedback LTAFeedback fb(itsParset.settings); itsConfiguration.adoptCollection(fb.correlatedFeedback(subbandIndex)); + itsConfigurationPrefix = fb.correlatedPrefix(subbandIndex); if (LofarStManVersion > 1) { string seqfilename = str(format("%s/table.f0seqnr") % msName); @@ -125,9 +126,9 @@ namespace LOFAR itsNrBlocksWritten++; - itsConfiguration.replace("size", str(format("%u") % getDataSize())); - itsConfiguration.replace("duration", str(format("%f") % ((data->sequenceNumber() + 1) * itsParset.settings.correlator.integrationTime()))); - itsConfiguration.replace("percentageWritten", str(format("%u") % percentageWritten())); + itsConfiguration.replace(itsConfigurationPrefix + "size", str(format("%u") % getDataSize())); + itsConfiguration.replace(itsConfigurationPrefix + "duration", str(format("%f") % ((data->sequenceNumber() + 1) * itsParset.settings.correlator.integrationTime()))); + itsConfiguration.replace(itsConfigurationPrefix + "percentageWritten", str(format("%u") % percentageWritten())); } diff --git a/RTCP/Cobalt/OutputProc/src/MSWriterDAL.cc b/RTCP/Cobalt/OutputProc/src/MSWriterDAL.cc index 260fab955922c19078ce90a3d0ab2eceb3eb0151..9e1e19ccc95f559e679729d60da63b0b23ca1cca 100644 --- a/RTCP/Cobalt/OutputProc/src/MSWriterDAL.cc +++ b/RTCP/Cobalt/OutputProc/src/MSWriterDAL.cc @@ -114,6 +114,7 @@ namespace LOFAR // Add file-specific processing feedback LTAFeedback fb(itsParset.settings); itsConfiguration.adoptCollection(fb.beamFormedFeedback(itsFileNr)); + itsConfigurationPrefix = fb.beamFormedPrefix(itsFileNr); itsNrExpectedBlocks = itsParset.settings.nrBlocks(); @@ -557,8 +558,8 @@ namespace LOFAR itsNextSeqNr = seqNr + 1; itsNrBlocksWritten++; - itsConfiguration.replace("size", str(format("%u") % getDataSize())); - itsConfiguration.replace("percentageWritten", str(format("%u") % percentageWritten())); + itsConfiguration.replace(itsConfigurationPrefix + "size", str(format("%u") % getDataSize())); + itsConfiguration.replace(itsConfigurationPrefix + "percentageWritten", str(format("%u") % percentageWritten())); } // specialisation for FinalBeamFormedData diff --git a/RTCP/Cobalt/OutputProc/src/OutputThread.cc b/RTCP/Cobalt/OutputProc/src/OutputThread.cc index 6c04b4b250823d2e73b95bd4ad7b212abd5bf581..88a761c4bc89864e6b7ae49576e3a80639be87a1 100644 --- a/RTCP/Cobalt/OutputProc/src/OutputThread.cc +++ b/RTCP/Cobalt/OutputProc/src/OutputThread.cc @@ -107,8 +107,7 @@ namespace LOFAR template<typename T> OutputThread<T>::OutputThread(const Parset &parset, unsigned streamNr, Pool<T> &outputPool, RTmetadata &mdLogger, const std::string &mdKeyPrefix, - const std::string &logPrefix, const std::string &targetDirectory, - const std::string <AfeedbackPrefix) + const std::string &logPrefix, const std::string &targetDirectory) : itsParset(parset), itsStreamNr(streamNr), @@ -116,7 +115,6 @@ namespace LOFAR itsMdKeyPrefix(mdKeyPrefix), itsLogPrefix(logPrefix), itsTargetDirectory(targetDirectory), - itsLTAfeedbackPrefix(LTAfeedbackPrefix), itsBlocksWritten(0), itsBlocksDropped(0), itsNrExpectedBlocks(0), @@ -229,7 +227,7 @@ namespace LOFAR ParameterSet result; try { - result.adoptCollection(itsWriter->configuration(), itsLTAfeedbackPrefix); + result.adoptCollection(itsWriter->configuration()); } catch (Exception &ex) { LOG_ERROR_STR(itsLogPrefix << "Could not obtain feedback for LTA: " << ex); } @@ -264,8 +262,7 @@ namespace LOFAR mdLogger, mdKeyPrefix, logPrefix + "[SubbandOutputThread] ", - targetDirectory, - LTAFeedback::correlatedPrefix(streamNr)) + targetDirectory) { } @@ -329,8 +326,7 @@ namespace LOFAR mdLogger, mdKeyPrefix, logPrefix + "[TABOutputThread] ", - targetDirectory, - LTAFeedback::beamFormedPrefix(streamNr)) + targetDirectory) { } diff --git a/RTCP/Cobalt/OutputProc/src/OutputThread.h b/RTCP/Cobalt/OutputProc/src/OutputThread.h index d7206ea1fa41013468e06ba71c493880c391b019..a99bc244f87fe39058a14104f2751acf218a3ccd 100644 --- a/RTCP/Cobalt/OutputProc/src/OutputThread.h +++ b/RTCP/Cobalt/OutputProc/src/OutputThread.h @@ -56,8 +56,7 @@ namespace LOFAR public: OutputThread(const Parset &parset, unsigned streamNr, Pool<T> &outputPool, RTmetadata &mdLogger, const std::string &mdKeyPrefix, - const std::string &logPrefix, const std::string &targetDirectory, - const std::string <AfeedbackPrefix); + const std::string &logPrefix, const std::string &targetDirectory); virtual ~OutputThread(); @@ -91,7 +90,6 @@ namespace LOFAR const std::string itsMdKeyPrefix; const std::string itsLogPrefix; const std::string itsTargetDirectory; - const std::string itsLTAfeedbackPrefix; size_t itsBlocksWritten, itsBlocksDropped; size_t itsNrExpectedBlocks;