casa5
Public
Commits
| 1635 1635 | |
| 1636 1636 | // ---------------------------------------------------------------------------- |
| 1637 1637 | // Set the time averaging iterator options for the visibility agents (clip, rflag, tfcrop) |
| 1638 1638 | // ---------------------------------------------------------------------------- |
| 1639 1639 | void |
| 1640 1640 | FlagDataHandler::setTimeAverageIter(bool activated) |
| 1641 1641 | { |
| 1642 1642 | enableTimeAvg_p = activated; |
| 1643 1643 | |
| 1644 1644 | // Setup the time averaging options |
| 1645 - | if (dataColumnType_p == "DATA") |
| 1645 + | if (dataColumnType_p.compare("DATA") == 0) |
| 1646 1646 | { |
| 1647 1647 | timeAvgOptions_p |= vi::AveragingOptions::AverageObserved; |
| 1648 1648 | timeAvgOptions_p |= vi::AveragingOptions::ObservedFlagWeightAvgFromSIGMA; |
| 1649 1649 | } |
| 1650 - | else if (dataColumnType_p == "CORRECTED") |
| 1650 + | else if (dataColumnType_p.compare("CORRECTED") == 0) |
| 1651 1651 | { |
| 1652 1652 | timeAvgOptions_p |= vi::AveragingOptions::AverageCorrected; |
| 1653 1653 | timeAvgOptions_p |= vi::AveragingOptions::CorrectedFlagWeightAvgFromWEIGHT; |
| 1654 1654 | } |
| 1655 - | else if (dataColumnType_p == "MODEL") |
| 1655 + | else if (dataColumnType_p.compare("MODEL") == 0) |
| 1656 1656 | { |
| 1657 1657 | timeAvgOptions_p |= vi::AveragingOptions::AverageModel; |
| 1658 1658 | timeAvgOptions_p |= vi::AveragingOptions::ModelPlainAvg; |
| 1659 1659 | } |
| 1660 - | else if (dataColumnType_p == "FLOAT_DATA") |
| 1660 + | else if (dataColumnType_p.compare("FLOAT_DATA") == 0) |
| 1661 1661 | { |
| 1662 1662 | timeAvgOptions_p |= vi::AveragingOptions::AverageFloat; |
| 1663 1663 | } |
| 1664 - | else if (dataColumnType_p == "RESIDUAL") |
| 1664 + | /* else if (dataColumnType_p.compare("RESIDUAL") == 0) |
| 1665 1665 | { |
| 1666 1666 | timeAvgOptions_p |= vi::AveragingOptions::AverageCorrected; |
| 1667 - | timeAvgOptions_p |= vi::AveragingOptions::CorrectedFlagWeightAvgFromWEIGHT; |
| 1668 1667 | timeAvgOptions_p |= vi::AveragingOptions::AverageModel; |
| 1669 - | timeAvgOptions_p |= vi::AveragingOptions::ModelFlagWeightAvgFromWEIGHT; |
| 1670 - | } |
| 1668 + | timeAvgOptions_p |= vi::AveragingOptions::ModelPlainAvg; |
| 1669 + | timeAvgOptions_p |= vi::AveragingOptions::CorrectedFlagWeightAvgFromWEIGHT |
| 1670 + | }*/ |
| 1671 + | |
| 1671 1672 | } |
| 1672 1673 | |
| 1673 1674 | // ---------------------------------------------------------------------------- |
| 1674 1675 | // Set the channel averaging iterator options for the visibility agents (clip, rflag, tfcrop) |
| 1675 1676 | // ---------------------------------------------------------------------------- |
| 1676 1677 | void |
| 1677 1678 | FlagDataHandler::setChanAverageIter(Vector<Int> chanbin) |
| 1678 1679 | { |
| 1679 1680 | enableChanAvg_p = true; |
| 1680 1681 | |