Changeset 777

Timestamp:

12/07/05 14:11:34 (18 years ago)

Author:

mar637

Message:

merge from Release12

Location:

trunk/src

Files:

• SDMemTable.cc (modified) (2 diffs)
• SDMemTable.h (modified) (1 diff)
• SDMemTableWrapper.h (modified) (1 diff)
• python_SDMemTable.cc (modified) (1 diff)

trunk/src/SDMemTable.cc

@@ -1631 +1631 @@
     mdr = MDirection::J2000;
     pushLog("WARNING: Unknown equinox using J2000");
-
   }
 
@@ -1837 +1836 @@
 }
 
+void SDMemTable::calculateAZEL()
+{
+  MPosition mp = getAntennaPosition();
+
+  for (uInt i=0; i<nRow();++i) {
+    MEpoch me = getEpoch(i);
+    MDirection md = getDirection(i,False);
+    MeasFrame frame(mp, me);
+    Vector<Double> azel =
+        MDirection::Convert(md, MDirection::Ref(MDirection::AZEL,
+                                                frame)
+                            )().getAngle("rad").getValue();
+    azCol_.put(i,azel[0]);
+    elCol_.put(i,azel[1]);
+  }
+}

trunk/src/SDMemTable.h

@@ -265 +265 @@
               const casa::Vector<casa::Int>& c);
 
+
+  void calculateAZEL();
 
 private:

trunk/src/SDMemTableWrapper.h

@@ -217 +217 @@
   }
 
+  void calculateAZEL() { table_->calculateAZEL(); };
 
 private:

trunk/src/python_SDMemTable.cc

@@ -108 +108 @@
     .def("_addfit", &SDMemTableWrapper::addFit)
     .def("_getfit", &SDMemTableWrapper::getSDFitTable)
+    .def("_recalc_azel", &SDMemTableWrapper::calculateAZEL)
   ;
 };