Changeset 773 for branches

Timestamp:

12/06/05 14:03:55 (19 years ago)

Author:

mar637

Message:

Request: added recalc_azel

Location:

branches/Release12

Files:

• python/__init__.py (modified) (2 diffs)
• python/scantable.py (modified) (2 diffs)
• src/SDMemTable.cc (modified) (2 diffs)
• src/SDMemTable.h (modified) (1 diff)
• src/SDMemTableWrapper.h (modified) (1 diff)
• src/python_SDMemTable.cc (modified) (1 diff)

branches/Release12/python/__init__.py

@@ -268 +268 @@
 
 __date__ = '$Date$'.split()[1]
-__version__  = '1.2'
+__version__  = '1.2.1'
 
 if rcParams['verbose']:
@@ -340 +340 @@
             poly_baseline   - fit a polynomial baseline to all Beams/IFs/Pols
             auto_poly_baseline - automatically fit a polynomial baseline
+            recalc_azel     - recalculate azimuth and elevation based on
+                              the pointing
             gain_el         - apply gain-elevation correction
             opacity         - apply opacity correction

branches/Release12/python/scantable.py

@@ -1372 +1372 @@
             else: raise
 
+    def recalc_azel(self):
+        varlist = vars()
+        """
+        Recalculate the azimuth and elevation for each position.
+        Parameters:
+            none
+        Example:
+        """
+        self._recalc_azel()
+        self._add_history("recalc_azel", varlist)
+        return
+
     def __add__(self, other):
         varlist = vars()
@@ -1386 +1398 @@
         print_log()
         return s
-
 
     def __sub__(self, other):

branches/Release12/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]);
+  }
+}

branches/Release12/src/SDMemTable.h

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

branches/Release12/src/SDMemTableWrapper.h

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

branches/Release12/src/python_SDMemTable.cc

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