casa / casa5 / 82f6ec0b1b7

Commits

Darrell Schiebel authored 82f6ec0b1b7 Merge 02 Apr 2018

Merge pull request #447 in CASA/casa from feature/CAS-10880 to master

* commit '109fb5da7a91395069b49e9871055f69148c1dfb':
  added note about user responsibility to ensure model is set for all fields in residual or residual_data cases
  ms.statwt2() doc updates
  updated docs for statwt2
  Added support for virtual source model, removed unnecessary default model since any constant model, including 0, will produce the same weights

code/mstransform/TVI/StatWtTVI.cc

Modified

-32
+#include <iomanip>
-33
-34
+using namespace casacore;
-35
+using namespace casac;
-36
-37
+namespace casa {
-38
+namespace vi {
-39
-40
+const String StatWtTVI::CHANBIN = "stchanbin";
-41
--
+const Complex StatWtTVI::DEFAULT_MODEL_VALUE(1, 0);
--
-42
+StatWtTVI::StatWtTVI(ViImplementation2 * inputVii, const Record &configuration)
-43
+    : TransformingVi2 (inputVii) {
-44
+	// Parse and check configuration parameters
-45
+	// Note: if a constructor finishes by throwing an exception, the memory
-46
+	// associated with the object itself is cleaned up there is no memory leak.
-47
+    ThrowIf(
-48
+        ! _parseConfiguration(configuration),
-49
+	    "Error parsing StatWtTVI configuration"
-50
+    );
-+
+    // FIXME when the TVI framework has methods to
-+
+    // check for metadata, like the existence of
-+
+    // columns, remove references to the original MS
-+
+    const auto& origMS = ms();
-55
+    ThrowIf(
-56
+        (_column == CORRECTED || _column == RESIDUAL)
--
+        && ! ms().isColumn(MSMainEnums::CORRECTED_DATA),
-+
+        && ! origMS.isColumn(MSMainEnums::CORRECTED_DATA),
-58
+        "StatWtTVI requires the MS to have a "
-59
+        "CORRECTED_DATA column. This MS does not"
-60
+    );
-61
+    ThrowIf(
-62
+        (_column == DATA || _column == RESIDUAL_DATA)
--
+        && ! ms().isColumn(MSMainEnums::DATA),
-+
+        && ! origMS.isColumn(MSMainEnums::DATA),
-64
+        "StatWtTVI requires the MS to have a "
-65
+        "DATA column. This MS does not"
-66
+    );
--
+    _useDefaultModelValue = (_column == RESIDUAL || _column == RESIDUAL_DATA)
--
+        && ! ms().isColumn(MSMainEnums::MODEL_DATA);
-+
+    _noModel = (_column == RESIDUAL || _column == RESIDUAL_DATA)
-+
+        && ! origMS.isColumn(MSMainEnums::MODEL_DATA)
-+
+        && ! origMS.source().isColumn(MSSourceEnums::SOURCE_MODEL);
-70
+	// Initialize attached VisBuffer
-71
+	setVisBuffer(createAttachedVisBuffer(VbRekeyable));
-72
+}
-73
-74
+StatWtTVI::~StatWtTVI() {}
-75
-76
+Bool StatWtTVI::_parseConfiguration(const Record& config) {
-77
+    String field = CHANBIN;
-78
+    if (config.isDefined(field)) {
-79
+        // channel binning
-941
+    _computeWeightsSlidingTimeWindow(chunkData, chunkFlags, rowMap, spw);
-942
+}
-943
-944
+const casacore::Cube<casacore::Complex> StatWtTVI::_dataCube(const VisBuffer2 *const vb) const {
-945
+    switch (_column) {
-946
+    case CORRECTED:
-947
+        return vb->visCubeCorrected();
-948
+    case DATA:
-949
+        return vb->visCube();
-950
+    case RESIDUAL:
--
+        return _useDefaultModelValue ? vb->visCubeCorrected() - DEFAULT_MODEL_VALUE
--
+            : vb->visCubeCorrected() - vb->visCubeModel();
-+
+        if (_noModel) {
-+
+            return vb->visCubeCorrected();
-+
+        }
-+
+        else {
-+
+            return vb->visCubeCorrected() - vb->visCubeModel();
-+
+        }
-957
+    case RESIDUAL_DATA:
--
+        return _useDefaultModelValue ? vb->visCube() - DEFAULT_MODEL_VALUE
--
+            : vb->visCube() - vb->visCubeModel();
-+
+        if(_noModel) {
-+
+            return vb->visCube();
-+
+        }
-+
+        else {
-+
+            return vb->visCube() - vb->visCubeModel();
-+
+        }
-964
+    default:
-965
+        ThrowCc("Logic error: column type not handled");
-966
+    }
-967
+}
-968
-969
+void StatWtTVI::_computeWeightsSlidingTimeWindow(
-970
+    const casacore::Cube<casacore::Complex>& data,
-971
+    const casacore::Cube<casacore::Bool>& flags,
-972
+    const std::vector<std::set<uInt>>& rowMap,
-973
+    uInt spw

casa5

Commits

Jira Issues

Add shortcut