Changeset 2720 for trunk/src/STApplyTable.h

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.h (modified) (5 diffs)

trunk/src/STApplyTable.h

@@ -22 +22 @@
 #include "Scantable.h"
 #include "STSelector.h"
+#include "STCalEnum.h"
 
 namespace asap {
@@ -36 +37 @@
   STApplyTable() {;}
   STApplyTable(const Scantable& parent, const casa::String& name);
+  STApplyTable(const casa::String &name);
 
   virtual ~STApplyTable();
@@ -55 +57 @@
   virtual void attachOptionalColumns() = 0;
 
-  casa::Int nrow() {return table_.nrow();}
+  casa::uInt nrow() {return table_.nrow();}
 
   casa::Vector<casa::uInt> getScan() {return scanCol_.getColumn();}
@@ -64 +66 @@
   casa::Vector<casa::Double> getTime() {return timeCol_.getColumn();}
 
-  void setSelection(STSelector &sel);
+  void setSelection(STSelector &sel, bool sortByTime=false);
   void unsetSelection();
+  casa::String caltype();
 
   void save(const casa::String &name);
+
+  virtual casa::uInt nchan(casa::uInt ifno) = 0;
+
+  // static methods
+  static STCalEnum::CalType getCalType(const casa::String &name);
+  static STCalEnum::CalType getCalType(casa::CountedPtr<STApplyTable> tab);
+  static STCalEnum::CalType getCalType(STApplyTable *tab);
 
 protected:
   void setbasedata(casa::uInt irow, casa::uInt scanno, casa::uInt cycleno,
                    casa::uInt beamno, casa::uInt ifno, casa::uInt polno, 
-                   casa::Double time);
+                   casa::uInt freqid, casa::Double time);
+  casa::Block<casa::Double> getFrequenciesRow(casa::uInt id);
 
   casa::Table table_, originaltable_;
-  casa::ScalarColumn<casa::uInt> scanCol_, cycleCol_, beamCol_, ifCol_, polCol_;
+  casa::ScalarColumn<casa::uInt> scanCol_, cycleCol_, beamCol_, ifCol_, polCol_, freqidCol_;
   casa::ScalarColumn<casa::Double> timeCol_;
   casa::MEpoch::ScalarColumn timeMeasCol_;
@@ -82 +93 @@
 
 private:
+  static STCalEnum::CalType stringToType(const casa::String &caltype);
 };