Changes in trunk/src/Scantable.cpp [1819:1947]

File:

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

trunk/src/Scantable.cpp

@@ -101 +101 @@
   fitTable_ = STFit(*this);
   table_.rwKeywordSet().defineTable("FIT", fitTable_.table());
+  table_.tableInfo().setType( "Scantable" ) ;
   originalTable_ = table_;
   attach();
@@ -120 +121 @@
     table_ = tab;
   }
+  table_.tableInfo().setType( "Scantable" ) ;
 
   attachSubtables();
@@ -165 +167 @@
       table_.markForDelete();
   }
+  table_.tableInfo().setType( "Scantable" ) ;
   /// @todo reindex SCANNO, recompute nbeam, nif, npol
   if ( clear ) copySubtables(other);
@@ -681 +684 @@
 std::string Scantable::formatTime(const MEpoch& me, bool showdate) const
 {
+  return formatTime(me, showdate, 0);
+}
+
+std::string Scantable::formatTime(const MEpoch& me, bool showdate, uInt prec) const
+{
   MVTime mvt(me.getValue());
   if (showdate)
-    mvt.setFormat(MVTime::YMD);
+    //mvt.setFormat(MVTime::YMD);
+    mvt.setFormat(MVTime::YMD, prec);
   else
-    mvt.setFormat(MVTime::TIME);
+    //mvt.setFormat(MVTime::TIME);
+    mvt.setFormat(MVTime::TIME, prec);
   ostringstream oss;
   oss << mvt;
@@ -1032 +1042 @@
 }
 
-std::string Scantable::getTime(int whichrow, bool showdate) const
-{
-  MEpoch::ROScalarColumn timeCol(table_, "TIME");
+// std::string Scantable::getTime(int whichrow, bool showdate) const
+// {
+//   MEpoch::ROScalarColumn timeCol(table_, "TIME");
+//   MEpoch me;
+//   if (whichrow > -1) {
+//     me = timeCol(uInt(whichrow));
+//   } else {
+//     Double tm;
+//     table_.keywordSet().get("UTC",tm);
+//     me = MEpoch(MVEpoch(tm));
+//   }
+//   return formatTime(me, showdate);
+// }
+
+std::string Scantable::getTime(int whichrow, bool showdate, uInt prec) const
+{
   MEpoch me;
-  if (whichrow > -1) {
-    me = timeCol(uInt(whichrow));
-  } else {
-    Double tm;
-    table_.keywordSet().get("UTC",tm);
-    me = MEpoch(MVEpoch(tm));
-  }
-  return formatTime(me, showdate);
+  me = getEpoch(whichrow);
+  return formatTime(me, showdate, prec);
 }
 
@@ -1709 +1726 @@
 }
 
+bool Scantable::getFlagtraFast(int whichrow)
+{
+  uChar flag;
+  Vector<uChar> flags;
+  flagsCol_.get(uInt(whichrow), flags);
+  for (int i = 0; i < flags.size(); i++) {
+    if (i==0) {
+      flag = flags[i];
+    }
+    else {
+      flag &= flags[i];
+    }
+    return ((flag >> 7) == 1);
+   }
+}
+
+void Scantable::doPolyBaseline(const std::vector<bool>& mask, int order, int rowno, Fitter& fitter)
+{
+  fitter.setExpression("poly", order);
+
+  std::vector<double> abcsd = getAbcissa(rowno);
+  std::vector<float> abcs;
+  for (int i = 0; i < abcsd.size(); i++) {
+    abcs.push_back((float)abcsd[i]);
+  }
+  std::vector<float> spec = getSpectrum(rowno);
+  std::vector<bool> fmask = getMask(rowno);
+  if (fmask.size() != mask.size()) {
+    throw(AipsError("different mask sizes"));
+  }
+  for (int i = 0; i < fmask.size(); i++) {
+    fmask[i] = fmask[i] && mask[i];
+  }
+  fitter.setData(abcs, spec, fmask);
+
+  fitter.lfit();
+}
+
+void Scantable::polyBaselineBatch(const std::vector<bool>& mask, int order)
+{
+  Fitter fitter = Fitter();
+  for (uInt rowno=0; rowno < nrow(); ++rowno) {
+    doPolyBaseline(mask, order, rowno, fitter);
+    setSpectrum(fitter.getResidual(), rowno);
+  }
+}
+
+STFitEntry Scantable::polyBaseline(const std::vector<bool>& mask, int order, int rowno)
+{
+  Fitter fitter = Fitter();
+  doPolyBaseline(mask, order, rowno, fitter);
+  setSpectrum(fitter.getResidual(), rowno);
+  return fitter.getFitEntry();
+}
+
 }
 //namespace asap