casa / casa5 / 1a9a96940f9

Commits

Ville Suoranta authored 1a9a96940f9 Merge 18 May 2018

Merge pull request #518 in CASA/casa from bugfix/CAS-11397 to master

* commit 'f43a26b193b6a36a782e6bb8985206d72f09d3e0':
  The diff should be clean now. Some changes in fudge_factor, etc. were still there. Revert "Some minor tweaks to required memory calculation for mosaic"
  oops wrong branch..reverted
  Some minor tweaks to required memory calculation for mosaic
  ensure test_rflag doesn't leave a Four_ants MS with model removed, re CAS-11397
  more data cleanup, some more asserts, re CAS-11397
  favor std string ==, re CAS-11397
  reorg setUp_ methods, avoid expensive mstransform at every test_preaveraging setUp, re CAS-11397
  split test_preaveraging_rflag_residual, re CAS-11397
  add tests rflag residual w/ chanavg, timeavg, check thresholds, re CAS-11397
  fix/do rflag/clip/tfcrop preaverage tests, re CAS-11397
  initialize avg TVI with adequate options when datacolumn='residual', re CAS-11397

code/flagging/Flagging/FlagDataHandler.cc

Modified

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

casa5

Commits

Jira Issues

Add shortcut