Changeset 2836 for trunk

Timestamp:

08/07/13 15:11:19 (11 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-5139/TRAC-290)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): sbseparator

Description:

sbseparator handles flagged data sets to some extent.

• separation of row flagged spectra (eigher in a part of or in all datasets) are handled properly.
• separation of partly channel flagged spectra are handled properly only when identical channels are flagged throughout data sets

TODO:
handle cases when flagged channels vary among datasets.

File:

• trunk/src/STSideBandSep.cpp (modified) (5 diffs)

trunk/src/STSideBandSep.cpp

@@ -547 +547 @@
   cout << "Grid parameter summary: " << endl;
   cout << "- IF = " << sigIfno_ << endl;
-  cout << "- center = " << scenter << ")\n"
+  cout << "- center = " << scenter << "\n"
        << "- npix = (" << nx << ", " << ny << ")\n"
-       << "- cell = (" << scellx << ", " << scelly << endl;
+       << "- cell = (" << scellx << ", " << scelly << ")" << endl;
 #endif
   gridder.grid();
@@ -642 +642 @@
     seltab_p->setSelection(sel2);
     CountedPtr<Scantable> avetab_p;
-    vector<bool> mask;
     if (seltab_p->nrow() > 1) {
+      // STMath::average also merges FLAGTRA and FLAGROW
       avetab_p = stm.average(vector< CountedPtr<Scantable> >(1, seltab_p),
                              vector<bool>(), "TINTSYS", "NONE");
@@ -655 +655 @@
       avetab_p = seltab_p;
     }
+    // Check FLAGTRA and FLAGROW if there's any valid channel in the spectrum
+    if (avetab_p->getFlagRow(0) || avetab_p->isAllChannelsFlagged(0)) {
+#ifdef KS_DEBUG
+      cout << "Table " << itab << " - All data are flagged. skipping the table."
+           << endl;
+#endif
+      continue;
+    }
+    // Interpolate flagged channels of the spectrum.
+    Vector<Float> tmpSpec = avetab_p->getSpectrum(0);
+    vector<bool> mask = avetab_p->getMask(0);
+    mathutil::doZeroOrderInterpolation(tmpSpec, mask);
     spec.reference(specMat.column(nspec));
-    spec = avetab_p->getSpectrum(0);
+    spec = tmpSpec;
     tabIdvec.push_back((uInt) itab);
     nspec++;
   } // end of table loop
+  // Check the number of selected spectra and resize matrix.
   if (nspec != nshift_){
     //shiftSpecmat.resize(nchan_, nspec, true);
+    specMat.resize(nchan_, nspec, true);
 #ifdef KS_DEBUG
       cout << "Could not find corresponding rows in some tables."
@@ -801 +815 @@
     throw(AipsError("Internal error. The number of input shifts and spectrum  differs."));
 
+#ifdef KS_DEBUG
   float minval, maxval;
+#endif
 #ifdef KS_DEBUG
   minMax(minval, maxval, specmat);
@@ -1208 +1224 @@
 
 bool STSideBandSep::getLo1FromAsdm(const string asdmname,
-                                   const double refval,
-                                   const double refpix,
-                                   const double increment,
-                                   const int nChan)
+                                   const double /*refval*/,
+                                   const double /*refpix*/,
+                                   const double /*increment*/,
+                                   const int /*nChan*/)
 {
   // Check for relevant tables.