Changeset 1603 for branches/alma/src/Scantable.cpp

Timestamp:

07/18/09 06:35:47 (15 years ago)

Author:

TakTsutsumi

Message:

New Development: No, merge with asap2.3.1

JIRA Issue: Yes CAS-1450

Ready to Release: Yes/No?

Interface Changes: Yes/No?

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes

Module(s): single dish

Description: Upgrade of alma branch based on ASAP2.2.0

(rev.1562) to ASAP2.3.1 (rev.1561)

File:

• branches/alma/src/Scantable.cpp (modified) (4 diffs)

branches/alma/src/Scantable.cpp

@@ -213 +213 @@
   td.addColumn(ScalarColumnDesc<String>("SRCNAME"));
   // Type of source (on=0, off=1, other=-1)
-  td.addColumn(ScalarColumnDesc<Int>("SRCTYPE", Int(-1)));
+  ScalarColumnDesc<Int> stypeColumn("SRCTYPE");
+  stypeColumn.setDefault(Int(-1));
+  td.addColumn(stypeColumn);
   td.addColumn(ScalarColumnDesc<String>("FIELDNAME"));
 
@@ -535 +537 @@
     return int(n);
   } else {
-    // take the first SCANNO,POLNO,BEAMNO,CYCLENO as nbeam shouldn't vary with these
+    // take the first SCANNO,POLNO,BEAMNO,CYCLENO as nbeam shouldn't
+    // vary with these
     Table t = table_(table_.col("IFNO") == ifno);
     if ( t.nrow() == 0 ) return 0;
@@ -885 +888 @@
 }
 
+MEpoch Scantable::getEpoch(int whichrow) const
+{
+  if (whichrow > -1) {
+    return timeCol_(uInt(whichrow));
+  } else {
+    Double tm;
+    table_.keywordSet().get("UTC",tm);
+    return MEpoch(MVEpoch(tm));  
+  }
+}
+
 std::string Scantable::getDirectionString(int whichrow) const
 {
@@ -892 +906 @@
 std::vector< double > Scantable::getAbcissa( int whichrow ) const
 {
-  if ( whichrow > int(table_.nrow()) ) throw(AipsError("Illegal ro number"));
+  if ( whichrow > int(table_.nrow()) ) throw(AipsError("Illegal row number"));
   std::vector<double> stlout;
   int nchan = specCol_(whichrow).nelements();