casa / casa5 / 64ee100b3c3

Commits

David Mehringer authored 64ee100b3c3 26 Apr 2018

only initialize spectrum column if chanbin requires it if that column is uninitialized to start with

code/mstransform/MSTransform/StatWtColConfig.cc

Modified

-69
+    casacore::Bool& mustWriteWt, casacore::Bool& mustWriteWtSp,
-70
+    casacore::Bool& mustWriteSig, casacore::Bool& mustWriteSigSp
-71
+) const {
-72
+    mustWriteWt = _mustWriteWt;
-73
+    mustWriteWtSp = _mustWriteWtSp;
-74
+    mustWriteSig = _mustWriteSig;
-75
+    mustWriteSigSp = _mustWriteSigSp;
-76
+}
-77
-78
+void StatWtColConfig::_determineFlags() {
--
+    auto hasWtSp = _ms->isColumn(MSMainEnums::WEIGHT_SPECTRUM);
-79
+    _mustWriteSig = _possiblyWriteSigma && ! _preview;
--
+    auto hasSigSp = _ms->isColumn(MSMainEnums::SIGMA_SPECTRUM);
--
+    _mustWriteSigSp = _mustWriteSig && hasSigSp;
-+
+    Bool hasSigSp = False;
-+
+    Bool sigSpIsInitialized = False;
-+
+    _hasSpectrumIsSpectrumInitialized(
-+
+        hasSigSp, sigSpIsInitialized, MS::SIGMA_SPECTRUM
-+
+    );
-+
+    _mustWriteSigSp = _mustWriteSig && (sigSpIsInitialized || _doChanBin);
-86
+    _mustWriteWt = ! _preview
-87
+        && (
-88
+            ! _mustWriteSig
-89
+            || (
-90
+                _mustWriteSig
-91
+                && ! _ms->isColumn(MSMainEnums::CORRECTED_DATA)
-92
+            )
-93
+        );
--
+    _mustWriteWtSp = _mustWriteWt && _doChanBin;
--
+    /*
--
+    if (_mustWriteWtSp) {
--
+        auto type = _tviConfig.type(_tviConfig.fieldNumber(vi::StatWtTVI::CHANBIN));
--
+        if (type == TpArrayBool) {
--
+            // default variant type
--
+            mustWriteWtSp = False;
--
+        }
--
+        else if (type == TpString) {
--
+            auto val = _tviConfig.asString(vi::StatWtTVI::CHANBIN);
--
+            val.downcase();
--
+            if (val == "spw") {
--
+                mustWriteWtSp = False;
--
+            }
--
+        }
--
+    }
--
+    */
-+
+    Bool hasWtSp = False;
-+
+    Bool wtSpIsInitialized = False;
-+
+    _hasSpectrumIsSpectrumInitialized(
-+
+        hasWtSp, wtSpIsInitialized, MS::WEIGHT_SPECTRUM
-+
+    );
-+
+    _mustWriteWtSp = _mustWriteWt && (wtSpIsInitialized || _doChanBin);
-100
+    static const auto colNameWtSp = MS::columnName(MS::WEIGHT_SPECTRUM);
-101
+    static const auto descWtSp = "weight spectrum";
-102
+    _dealWithSpectrumColumn(
--
+        hasWtSp, _mustWriteWtSp, _mustInitWtSp,
--
+        _mustWriteWt, colNameWtSp, descWtSp
-+
+        hasWtSp, _mustWriteWtSp, _mustInitWtSp, _mustWriteWt,
-+
+        colNameWtSp, descWtSp, wtSpIsInitialized
-105
+    );
-106
+    static const auto colNameSigSp = MS::columnName(MS::SIGMA_SPECTRUM);
-107
+    static const auto descSigSp = "sigma spectrum";
-108
+    _dealWithSpectrumColumn(
--
+        hasSigSp, _mustWriteSigSp, _mustInitSigSp,
--
+        _mustWriteSig, colNameSigSp, descSigSp
-+
+        hasSigSp, _mustWriteSigSp, _mustInitSigSp, _mustWriteSig,
-+
+        colNameSigSp, descSigSp, sigSpIsInitialized
-111
+    );
-112
+    LogIO log(LogOrigin("StatWtColConfig", __func__));
-113
+    if (_mustWriteWt) {
-114
+        if (_mustWriteSig) {
-115
+            log << LogIO::NORMAL
-116
+                << "CORRECTED_DATA is not present. Updating the "
-117
+                << "SIGMA/SIGMA_SPECTRUM and WEIGHT/WEIGHT_SPECTRUM values "
-118
+                << "based on calculations using the DATA column."
-119
+                << LogIO::POST;
-120
+        }
-175
+                vb->initWeightSpectrum(newsp);
-176
+            }
-177
+            if (_mustInitSigSp) {
-178
+                vb->initSigmaSpectrum(newsp);
-179
+            }
-180
+            vb->writeChangesBack();
-181
+        }
-182
+    }
-183
+}
-184
-+
+void StatWtColConfig::_hasSpectrumIsSpectrumInitialized(
-+
+    bool& hasSpectrum, bool& spectrumIsInitialzed,
-+
+    MS::PredefinedColumns col
-+
+) const {
-+
+    hasSpectrum = _ms->isColumn(col);
-+
+    if (! hasSpectrum) {
-+
+        // no column, so it is obviously not initialized
-+
+        spectrumIsInitialzed = False;
-+
+        return;
-+
+    }
-+
+    ArrayColumn<Float> column(*_ms, MS::columnName(col));
-+
+    try {
-+
+        column.get(0);
-+
+        // we were able to get a row, so its initialized.
-+
+        spectrumIsInitialzed = True;
-+
+    }
-+
+    catch (const AipsError& x) {
-+
+        // attempt to get first row failed, its not initialized.
-+
+        spectrumIsInitialzed = False;
-+
+    }
-+
+}
-+
-207
+void StatWtColConfig::_dealWithSpectrumColumn(
-208
+    Bool& hasSpec, Bool& mustWriteSpec, Bool& mustInitSpec,
-209
+    Bool mustWriteNonSpec, const String& colName,
--
+    const String& descName
-+
+    const String& descName, Bool specIsInitialized
-211
+) {
-212
+    // this conditional structure supports the
-213
+    // case of ! hasSpec && ! mustWriteSpec, in which case,
-214
+    // nothing need be done
-215
+    if (! hasSpec) {
-216
+        if (mustWriteSpec) {
-217
+            // we must create spectrum column
-218
+            hasSpec = True;
-219
+            mustInitSpec = True;
-220
+            // from Calibrater.cc
-231
+            }
-232
+            // Add the column
-233
+            String colWtSp = colName;
-234
+            TableDesc tdWtSp;
-235
+            tdWtSp.addColumn(ArrayColumnDesc<Float>(colWtSp, descName, 2));
-236
+            TiledShapeStMan wtSpStMan("TiledWgtSpectrum", dts);
-237
+            _ms->addColumn(tdWtSp, wtSpStMan);
-238
+        }
-239
+    }
-240
+    else if (mustWriteNonSpec) {
--
+        // check to see if extant spectrum column needs to be initialized
--
+        ArrayColumn<Float> col(*_ms, colName);
--
+        try {
--
+            col.get(0);
--
+            // its initialized, so even if we are using the full spw for
--
+            // binning, we still need to update WEIGHT_SPECTRUM
-+
+        if (specIsInitialized) {
-+
+            // it's initialized, so even if we are using the full
-+
+            // spw for binning, we still need to update *_SPECTRUM
-244
+            mustWriteSpec = True;
-245
+        }
--
+        catch (const AipsError& x) {
--
+            // its not initialized, so we aren't going to write to it unless
-+
+        else {
-+
+            // it's not initialized, so we aren't going to write to it unless
-248
+            // chanbin has been specified to be less than the spw width
-249
+            mustInitSpec = mustWriteSpec;
-250
+        }
-251
+    }
-252
+}
-253
-254
+}

casa5

Commits

Jira Issues

Add shortcut