Changeset 3009 for trunk/src

Timestamp:

10/30/14 03:28:31 (10 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix: proper row flag handling in Scantable::subBaseline.

File:

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

trunk/src/Scantable.cpp

@@ -2652 +2652 @@
     } else {
       btp = new STBaselineTable(*this);
-      for (int i = 0; i < nRowSt; ++i) {
-        btp->appendbasedata(getScan(i), getCycle(i), getBeam(i), getIF(i), getPol(i), 
-                           0, timeSecCol[i]);
-        btp->setApply(i, false);
-      }
+      // for (int i = 0; i < nRowSt; ++i) {
+      //   btp->appendbasedata(getScan(i), getCycle(i), getBeam(i), getIF(i), getPol(i), 
+      //                   0, timeSecCol[i]);
+      //   btp->setApply(i, false);
+      // }
+    }
+    int nrow = btp->nrow();
+    for (int i = nrow; i < nRowSt; ++i) {
+      btp->appendbasedata(getScan(i), getCycle(i), getBeam(i), getIF(i), getPol(i), 
+                          0, timeSecCol[i]);
+      btp->setApply(i, false);
     }
   }
@@ -2678 +2684 @@
       float rms;
       std::vector<bool> finalmask;
-
-      std::vector<float> resfit = doSubtractBaseline(spec, mask, ftype, fpar, params, rms, finalmask, clipth, clipn, uself, irow, lfth, lfedge, lfavg);
-      setSpectrum(resfit, irow);
+      Bool doApply = True;
+      
+      if (flagrowCol_(irow) == 0) {
+        std::vector<float> resfit = doSubtractBaseline(spec, mask, ftype, fpar, params, rms, finalmask, clipth, clipn, uself, irow, lfth, lfedge, lfavg);
+        setSpectrum(resfit, irow);
+      }
+      else {
+        doApply = False;
+      }
 
       if (returnfitresult) {
@@ -2695 +2707 @@
                     uInt(getScan(irow)), uInt(getCycle(irow)), 
                     uInt(getBeam(irow)), uInt(getIF(irow)), uInt(getPol(irow)), 
-                    uInt(0), timeSecCol[irow], Bool(true), ftype, fparam, 
+                    uInt(0), timeSecCol[irow], doApply, ftype, fparam, 
                     Vector<Float>(), getMaskListFromMask(finalmask), Vector<Float>(params), 
                     Float(rms), uInt(spec.size()), Float(clipth), uInt(clipn), 
@@ -2902 +2914 @@
   }
   for (uInt j = 0; j < masklist.size(); j += 2) {
-    for (int i = masklist[j]; i <= masklist[j+1]; ++i) {
+    for (int i = masklist[j]; i <= min(nchan-1, masklist[j+1]); ++i) {
       res[i] = true;
     }