Changeset 2883 for trunk

Timestamp:

12/20/13 21:17:06 (11 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): sd

Description: fixed two bugs in Scantable::subBaseline() reported by Kana: (1) RuntimeError "too many channels masked..." occurs when clipniter>0 and (2) RuntimeError "row index is out of range" occurs when outbltable exists.

Location:

trunk/src

Files:

• STBaselineTable.cpp (modified) (1 diff)
• Scantable.cpp (modified) (4 diffs)

trunk/src/STBaselineTable.cpp

@@ -113 +113 @@
 {
   if (irow >= (uInt)nrow()) {
-    throw AipsError("row index out of range");
+    //throw AipsError("row index out of range");
+    stringstream ss;
+    ss << "row index out of range[irow=" << irow << "][nrow=" << nrow() << "]";
+    throw AipsError(ss.str());
   }
 

trunk/src/Scantable.cpp

@@ -2582 +2582 @@
   }
 
-  STBaselineTable bt = STBaselineTable(*this);
+  STBaselineTable* btp;
   ROScalarColumn<Double> tcol = ROScalarColumn<Double>(table_, "TIME");
   Vector<Double> timeSecCol = tcol.getColumn();
 
-  if (outBaselineTable && !outbltableexists) {
-    for (int i = 0; i < nRowSt; ++i) {
-      bt.appendbasedata(getScan(i), getCycle(i), getBeam(i), getIF(i), getPol(i), 
-                         0, timeSecCol[i]);
-      bt.setApply(i, false);
+  if (outBaselineTable) {
+    if (outbltableexists) {
+      btp = new STBaselineTable((String)outbltable);
+    } 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);
+      }
     }
   }
@@ -2626 +2631 @@
         }
 
-        bt.setdata(uInt(irow), 
+        btp->setdata(uInt(irow), 
                     uInt(getScan(irow)), uInt(getCycle(irow)), 
                     uInt(getBeam(irow)), uInt(getIF(irow)), uInt(getPol(irow)), 
@@ -2639 +2644 @@
 
   if (outBaselineTable) {
-    bt.save(outbltable);
-  }
-
+    btp->save(outbltable);
+  }
+
+  delete btp;
   return res;
 }
@@ -2756 +2762 @@
   ss >> masklist0;
   mask = getMaskFromMaskList(nchan(getIF(irow)), splitToIntList(masklist0, ','));
+  ss.clear(); ss.str("");
 
   ss << res[4];