Changeset 212

Timestamp:

01/19/05 13:26:20 (19 years ago)

Author:

kil064

Message:

add function 'getDirectionReference' and 'getTimeReference' and
use them internally

Location:

trunk/src

Files:

• SDMemTable.cc (modified) (3 diffs)
• SDMemTable.h (modified) (1 diff)

trunk/src/SDMemTable.cc

@@ -365 +365 @@
   tme.get(whichRow,obstime);
   MVEpoch tm2(Quantum<Double>(obstime, Unit(String("d"))));
-  MEpoch::Types met;
-  String ep;
-  table_.keywordSet().get("Epoch",ep);
-  if (!MEpoch::getType(met, ep)) {
-    cerr << "Epoch type uknown - using UTC" << endl;
-    met = MEpoch::UTC;
-  }
-
+  MEpoch::Types met = getTimeReference();
   MEpoch epoch(tm2, met);
 
@@ -608 +601 @@
 MDirection SDMemTable::getDirection(Int whichRow) const
 {
-  Float eq;
-  table_.keywordSet().get("Equinox",eq);
-  std::map<float,string> mp;
-  mp[2000.0] = "J2000";
-  mp[1950.0] = "B1950";
-  MDirection::Types mdr;
-  if (!MDirection::getType(mdr, mp[eq])) {
-    mdr = MDirection::J2000;
-    cerr  << "Unknown equinox using J2000" << endl;
-  }
+  MDirection::Types mdr = getDirectionReference();
   ROArrayColumn<Double> dir(table_, "DIRECTION");
   Array<Double> posit;
@@ -1062 +1046 @@
   spec.put(whichRow, arr);
 }
+
+MDirection::Types SDMemTable::getDirectionReference () const
+{  
+  Float eq;
+  table_.keywordSet().get("Equinox",eq);
+  std::map<float,string> mp;
+  mp[2000.0] = "J2000";
+  mp[1950.0] = "B1950";
+  MDirection::Types mdr;
+  if (!MDirection::getType(mdr, mp[eq])) {   
+    mdr = MDirection::J2000;
+    cerr  << "Unknown equinox using J2000" << endl;
+  }
+//
+  return mdr;
+}
+
+MEpoch::Types SDMemTable::getTimeReference () const
+{
+  MEpoch::Types met;
+  String ep;
+  table_.keywordSet().get("Epoch",ep);
+  if (!MEpoch::getType(met, ep)) {
+    cerr << "Epoch type uknown - using UTC" << endl;
+    met = MEpoch::UTC;
+  }
+//
+  return met;
+}
+

trunk/src/SDMemTable.h

@@ -162 +162 @@
   std::vector<double> getAbcissa(int whichRow=0) const;
   std::string getAbcissaString(casa::Int whichRow=0) const;
-  
+
+// Get MDirection for this row
   casa::MDirection getDirection(casa::Int whichRow=0) const; 
+
+// Get gloabl Direction reference 
+  casa::MDirection::Types getDirectionReference () const;
+
+// Get global Time reference
+  casa::MEpoch::Types getTimeReference () const;
 
 private: