Commits

Ville Suoranta authored 7ff9b6d8c62 Merge
Merge pull request #245 in CASA/casa6 from CAS-12315 to master

* commit '2fea6bc8351536d4538111e13b55d15a412eaf8b': decrease freq of progress lines (type A) to every 10%, CAS-12315 fix frequency of partial summaries (type B), send other type A msgs to DEBUG level, CAS-12315 avoid minor code duplication in log messages, CAS-12315 fix frequency per-chunk progress update lines, separate frequency of messages types A and B, CAS-12315

casa5/code/flagging/Flagging/FlagAgentBase.cc

Modified
1954 1954
1955 1955 void
1956 1956 FlagAgentBase::chunkSummary()
1957 1957 {
1958 1958 logger_p->origin(LogOrigin(agentName_p,__FUNCTION__));
1959 1959
1960 1960 // With this check we skip cases like summary or display
1961 1961 if (chunkFlags_p > 0)
1962 1962 {
1963 1963 tableFlags_p += chunkFlags_p;
1964 - if (flag_p)
1965 - {
1966 - *logger_p << LogIO::NORMAL << "=> " << "Data flagged so far " << 100.0*chunkFlags_p/flagDataHandler_p->progressCounts_p<< "%" << LogIO::POST;
1967 - }
1968 - else
1969 - {
1970 - *logger_p << LogIO::NORMAL << "=> " << "Data unflagged so far: " << 100.0*chunkFlags_p/flagDataHandler_p->progressCounts_p<< "%" << LogIO::POST;
1964 + std::string flagStr = "unflagged";
1965 + if (flag_p) {
1966 + flagStr = "flagged";
1971 1967 }
1972 -
1968 + *logger_p << LogIO::NORMAL << "=> " << "Data " << flagStr << " so far " <<
1969 + 100.0*chunkFlags_p/flagDataHandler_p->progressCounts_p<< "%" << LogIO::POST;
1973 1970 }
1974 1971
1975 1972 // Only the clipping agent is capable of detecting this, and besides in general
1976 1973 // we should not have NaNs, so it is better not to print this log if possible
1977 1974 if (chunkNaNs_p > 0)
1978 1975 {
1979 1976 tableNaNs_p += chunkNaNs_p;
1980 1977 *logger_p << LogIO::NORMAL << "=> " << "Number of NaNs detected so far: " << (Double)chunkNaNs_p << LogIO::POST;
1981 1978 }
1982 1979

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut