Changeset 2767 for trunk/src/STBaselineTable.cpp

Timestamp:

02/08/13 22:23:22 (11 years ago)

Author:

WataruKawasaki

Message:

New Development: Yes

JIRA Issue: Yes CAS-4794

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): sd

Description: functions to apply/write STBaselineTable in which baseline parameters stored.

File:

• trunk/src/STBaselineTable.cpp (modified) (6 diffs)

trunk/src/STBaselineTable.cpp

@@ -51 +51 @@
 void STBaselineTable::setup()
 {
-  table_.addColumn(ScalarColumnDesc<uInt>("NCHAN"));
+  table_.addColumn(ScalarColumnDesc<Bool>("APPLY"));
   table_.addColumn(ScalarColumnDesc<uInt>("FUNC_TYPE"));
-  table_.addColumn(ArrayColumnDesc<uInt>("FUNC_PARAM"));
+  table_.addColumn(ArrayColumnDesc<Int>("FUNC_PARAM"));
   table_.addColumn(ArrayColumnDesc<Float>("FUNC_FPARAM"));
-  table_.addColumn(ScalarColumnDesc<uInt>("CLIP_ITERATION"));
-  table_.addColumn(ScalarColumnDesc<Float>("CLIP_THRESHOLD"));
   table_.addColumn(ArrayColumnDesc<uInt>("MASKLIST"));
   table_.addColumn(ArrayColumnDesc<Float>("RESULT"));
   table_.addColumn(ScalarColumnDesc<Float>("RMS"));
+  table_.addColumn(ScalarColumnDesc<uInt>("NCHAN"));
+  table_.addColumn(ScalarColumnDesc<Float>("CLIP_THRESHOLD"));
+  table_.addColumn(ScalarColumnDesc<uInt>("CLIP_ITERATION"));
+  table_.addColumn(ScalarColumnDesc<Float>("LF_THRESHOLD"));
+  table_.addColumn(ScalarColumnDesc<uInt>("LF_AVERAGE"));
+  table_.addColumn(ArrayColumnDesc<uInt>("LF_EDGE"));
 
   table_.rwKeywordSet().define("ApplyType", "BASELINE");
@@ -68 +72 @@
 void STBaselineTable::attachOptionalColumns()
 {
-  nchanCol_.attach(table_, "NCHAN");
+  applyCol_.attach(table_, "APPLY");
   ftypeCol_.attach(table_, "FUNC_TYPE");
   fparCol_.attach(table_, "FUNC_PARAM");
   ffparCol_.attach(table_, "FUNC_FPARAM");
-  citerCol_.attach(table_, "CLIP_ITERATION");
-  cthresCol_.attach(table_, "CLIP_THRESHOLD");
   maskCol_.attach(table_, "MASKLIST");
   resCol_.attach(table_, "RESULT");
   rmsCol_.attach(table_, "RMS");
+  nchanCol_.attach(table_, "NCHAN");
+  cthresCol_.attach(table_, "CLIP_THRESHOLD");
+  citerCol_.attach(table_, "CLIP_ITERATION");
+  lfthresCol_.attach(table_, "LF_THRESHOLD");
+  lfavgCol_.attach(table_, "LF_AVERAGE");
+  lfedgeCol_.attach(table_, "LF_EDGE");
 }
 
@@ -90 +98 @@
                               uInt beamno, uInt ifno, uInt polno, 
                               uInt freqid, Double time, 
-                              uInt nchan, 
+                              Bool apply, 
                               STBaselineFunc::FuncName ftype, 
-                              Vector<uInt> fpar, 
+                              Vector<Int> fpar, 
                               Vector<Float> ffpar, 
-                              uInt citer, 
-                              Float cthres,
                               Vector<uInt> mask,
                               Vector<Float> res,
-                              Float rms)
+                              Float rms, 
+                              uInt nchan, 
+                              Float cthres,
+                              uInt citer, 
+                              Float lfthres, 
+                              uInt lfavg, 
+                              Vector<uInt> lfedge)
 {
   if (irow >= (uInt)nrow()) {
@@ -110 +122 @@
 
   setbasedata(irow, scanno, cycleno, beamno, ifno, polno, freqid, time);
-  nchanCol_.put(irow, nchan);
+  applyCol_.put(irow, apply);
   ftypeCol_.put(irow, uInt(ftype));
   fparCol_.put(irow, fpar);
   ffparCol_.put(irow, ffpar);
-  citerCol_.put(irow, citer);
-  cthresCol_.put(irow, cthres);
   maskCol_.put(irow, mask);
   resCol_.put(irow, res);
   rmsCol_.put(irow, rms);
+  nchanCol_.put(irow, nchan);
+  cthresCol_.put(irow, cthres);
+  citerCol_.put(irow, citer);
+  lfthresCol_.put(irow, lfthres);
+  lfavgCol_.put(irow, lfavg);
+  lfedgeCol_.put(irow, lfedge);
 }
 
@@ -124 +140 @@
                                  uInt beamno, uInt ifno, uInt polno, 
                                  uInt freqid, Double time, 
-                                 uInt nchan, 
+                                 Bool apply, 
                                  STBaselineFunc::FuncName ftype, 
-                                 Vector<uInt> fpar, 
+                                 Vector<Int> fpar, 
                                  Vector<Float> ffpar, 
-                                 uInt citer, 
-                                 Float cthres,
                                  Vector<uInt> mask,
                                  Vector<Float> res,
-                                 Float rms)
+                                 Float rms,
+                                 uInt nchan, 
+                                 Float cthres,
+                                 uInt citer, 
+                                 Float lfthres, 
+                                 uInt lfavg, 
+                                 Vector<uInt> lfedge)
 {
   uInt irow = nrow();
   table_.addRow(1, True);
   setdata(irow, scanno, cycleno, beamno, ifno, polno, freqid, time, 
-          nchan, ftype, fpar, ffpar, citer, cthres, mask, res, rms);
-}
-
-Vector<STBaselineFunc::FuncName> STBaselineTable::getFunctionAsString()
+          apply, ftype, fpar, ffpar, mask, res, rms, 
+          nchan, cthres, citer, lfthres, lfavg, lfedge);
+}
+
+void STBaselineTable::appendbasedata(int scanno, int cycleno, 
+                                     int beamno, int ifno, int polno, 
+                                     int freqid, Double time)
+{
+  uInt irow = nrow();
+  table_.addRow(1, True);
+  setbasedata(irow, uInt(scanno), uInt(cycleno), uInt(beamno), uInt(ifno), uInt(polno), uInt(freqid), time);
+}
+
+void STBaselineTable::setresult(casa::uInt irow, 
+                                casa::Vector<casa::Float> res, 
+                                casa::Float rms)
+{
+  resCol_.put(irow, res);
+  rmsCol_.put(irow, rms);
+}
+
+bool STBaselineTable::getApply(int irow)
+{
+  return (bool)applyCol_.get(irow);
+}
+
+void STBaselineTable::setApply(int irow, bool apply)
+{
+  applyCol_.put(uInt(irow), Bool(apply));
+}
+
+Vector<STBaselineFunc::FuncName> STBaselineTable::getFunctionNames()
 {
   Vector<uInt> rawBlfuncColumn = ftypeCol_.getColumn();
@@ -149 +197 @@
   }
   return blfuncColumn;
+}
+
+STBaselineFunc::FuncName STBaselineTable::getFunctionName(int irow)
+{
+  return STBaselineFunc::FuncName(ftypeCol_.get(irow));
+}
+
+std::vector<int> STBaselineTable::getFuncParam(int irow)
+{
+  Vector<Int> uiparam = fparCol_.get(irow);
+  std::vector<int> res(uiparam.size());
+  for (uInt i = 0; i < res.size(); ++i) {
+    res[i] = (int)uiparam[i];
+  }
+  return res;
+}
+
+std::vector<bool> STBaselineTable::getMask(int irow)
+{
+  uInt nchan = getNChan(irow);
+  Vector<uInt> masklist = maskCol_.get(irow);
+  std::vector<int> masklist1(masklist.size());
+  for (uInt i = 0; i < masklist1.size(); ++i) {
+    masklist1[i] = (int)masklist[i];
+  }
+  return Scantable::getMaskFromMaskList(nchan, masklist1);
+}
+
+uInt STBaselineTable::getNChan(int irow)
+{
+  return nchanCol_.get(irow);
 }