Changeset 2720 for trunk/src/STApplyTable.cpp

Timestamp:

01/09/13 19:27:23 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: Yes

JIRA Issue: Yes CAS-4770 and its sub-tickets

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...

First version of applycal for single dish calibration.
Added new classes for the operation (STApplyCal, Calibrator, PSAlmaCalibrator,
Locator, BisectionLocator?, Interpolator1D, NearestInterpolator1D).
Also, modified existing classes to fit with implementation of applycal.

File:

• trunk/src/STApplyTable.cpp (modified) (7 diffs)

trunk/src/STApplyTable.cpp

@@ -15 +15 @@
 #include <tables/Tables/ScaColDesc.h>
 #include <tables/Tables/TableRecord.h>
+#include <tables/Tables/Table.h>
+#include <tables/Tables/ExprNode.h>
 #include <measures/TableMeasures/TableMeasDesc.h>
 #include <measures/TableMeasures/TableMeasRefDesc.h>
@@ -35 +37 @@
   td.addColumn(ScalarColumnDesc<uInt>("IFNO"));
   td.addColumn(ScalarColumnDesc<uInt>("POLNO"));
+  td.addColumn(ScalarColumnDesc<uInt>("FREQ_ID"));
   td.addColumn(ScalarColumnDesc<Double>("TIME"));
   TableMeasRefDesc measRef(MEpoch::UTC); // UTC as default
@@ -53 +56 @@
   table_.tableInfo().setType("ApplyTable");
 
+  originaltable_ = table_;
+}
+
+STApplyTable::STApplyTable(const String &name)
+{
+  table_ = Table(name, Table::Update);
+  attachBaseColumns();
   originaltable_ = table_;
 }
@@ -76 +86 @@
   timeCol_.attach(table_, "TIME");
   timeMeasCol_.attach(table_, "TIME");
+  freqidCol_.attach(table_, "FREQ_ID");
 }
 
-void STApplyTable::setSelection(STSelector &sel)
+void STApplyTable::setSelection(STSelector &sel, bool sortByTime)
 {
   table_ = sel.apply(originaltable_);
+  if (sortByTime)
+    table_.sort("TIME", Sort::Descending);
   attach();
   sel_ = sel;
@@ -94 +107 @@
 void STApplyTable::setbasedata(uInt irow, uInt scanno, uInt cycleno,
                                uInt beamno, uInt ifno, uInt polno, 
-                               Double time)
+                               uInt freqid, Double time)
 {
   scanCol_.put(irow, scanno);
@@ -102 +115 @@
   polCol_.put(irow, polno);
   timeCol_.put(irow, time);
+  freqidCol_.put(irow, freqid);
 }
 
@@ -109 +123 @@
 }
 
+String STApplyTable::caltype()
+{
+  if (table_.keywordSet().isDefined("ApplyType")) {
+    return table_.keywordSet().asString("ApplyType");
+  }
+  else 
+    return "NONE";
 }
+
+STCalEnum::CalType  STApplyTable::getCalType(const String &name)
+{
+  Table t(name, Table::Old);
+  return stringToType(t.keywordSet().asString("ApplyType"));
+}
+
+STCalEnum::CalType STApplyTable::getCalType(CountedPtr<STApplyTable> tab)
+{
+  return stringToType(tab->caltype());
+}
+
+STCalEnum::CalType STApplyTable::getCalType(STApplyTable *tab)
+{
+  return stringToType(tab->caltype());
+}
+
+STCalEnum::CalType STApplyTable::stringToType(const String &caltype)
+{
+  if (caltype == "CALSKY_PSALMA")
+    return STCalEnum::CalPSAlma;
+  else if (caltype == "CALTSYS")
+    return STCalEnum::CalTsys;
+  else
+    return STCalEnum::NoType;
+}
+
+Block<Double> STApplyTable::getFrequenciesRow(uInt id)
+{
+  const TableRecord &rec = table_.keywordSet();
+  rec.print(os_.output());
+  os_ << LogIO::POST;
+  Table ftab = rec.asTable("FREQUENCIES");
+  Table t = ftab(ftab.col("ID") == id);
+  ROTableColumn col(t, "REFPIX");
+  Block<Double> r(3);
+  r[0] = col.asdouble(0);
+  col.attach(t, "REFVAL");
+  r[1] = col.asdouble(0);
+  col.attach(t, "INCREMENT");
+  r[2] = col.asdouble(0);
+  return r;
+}
+}