Changeset 2838 for trunk/src

Timestamp:

08/07/13 18:48:20 (11 years ago)

Author:

Kana Sugimoto

Message:

New Development: No (bug fixes)

JIRA Issue: Yes (CAS-5139)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): sbseparator

Description:

a couple of bug fixes.

• flags are properly updated in case rows in the first gridded table is flagged.
• fixed a bug in channel shift resolution when data is flagged in some tables (nspec != ntable in some spectral groups).

File:

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

trunk/src/STSideBandSep.cpp

@@ -286 +286 @@
     sigSpec = solve(specMat, tabIdvec, true);
     sigTab_p->setSpectrum(sigSpec, irow);
+    if (sigTab_p->isAllChannelsFlagged(irow)){
+      // unflag the spectrum since there should be some valid data
+      sigTab_p->flagRow(vector<uInt>(irow), true);
+      sigTab_p->flag(irow, vector<bool>(), true);
+    }
 
     // Solve image sideband
@@ -291 +296 @@
       imgSpec = solve(specMat, tabIdvec, false);
       imgTab_p->setSpectrum(imgSpec, irow);
+      if (imgTab_p->isAllChannelsFlagged(irow)){
+        // unflag the spectrum since there should be some valid data
+        imgTab_p->flagRow(vector<uInt>(irow), true);
+        imgTab_p->flag(irow, vector<bool>(), true);
+      }
     }
   } // end of row loop
@@ -722 +732 @@
     // (solve signal && solveother = F) OR (solve image && solveother = T)
     thisShift =  &sigShift_;
-    otherShift = &imgShift_; 
+    otherShift = &imgShift_;
 #ifdef KS_DEBUG
     cout << "Signal sideband will be deconvolved." << endl;
@@ -732 +742 @@
   double tempshift;
   Vector<float> shiftspvec;
+  uInt shiftId;
   for (uInt i = 0 ; i < nspec; i++) {
-    spshift[i] = otherShift->at(i) - thisShift->at(i);
-    tempshift = - thisShift->at(i);
+    shiftId = tabIdvec[i];
+    spshift[i] = otherShift->at(shiftId) - thisShift->at(shiftId);
+    tempshift = - thisShift->at(shiftId);
     shiftspvec.reference(shiftSpecmat.column(i));
     shiftSpectrum(specmat.column(i), tempshift, shiftspvec);