Changeset 787 for branches/Release12

Timestamp:

12/08/05 13:58:59 (18 years ago)

Author:

phi196

Message:

Added get_elevation, azimuth and parangle

Location:

branches/Release12

Files:

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

branches/Release12/python/__init__.py

@@ -298 +298 @@
             get_time        - get the timestamps of the integrations
             get_sourcename  - get the source names of the scans
+            get_azimith     - get the azimuth of the scans
+            get_elevation   - get the elevation of the scans
+            get_parangle    - get the parallactic angle of the scans
             get_unit        - get the currnt unit
             set_unit        - set the abcissa unit to be used from this

branches/Release12/python/scantable.py

@@ -429 +429 @@
     def get_sourcename(self, row=-1):
         """
-        Get a list source anmes for the observations.
+        Get a list source names for the observations.
         Return a string for each integration in the scantable.
         Parameters:
@@ -442 +442 @@
             if  0 <= row < self.nrow():
                 return self._getsourcename(row)
+
+    def get_elevation(self, row=-1):
+        """
+        Get a list of elevations for the observations.
+        Return a float for each integration in the scantable.
+        Parameters:
+            row:    row no of integration. Default -1 return all rows
+        Example:
+            none
+        """
+        out = []
+        if row == -1:
+            return [self._getelevation(i) for i in range(self.nrow())]
+        else:
+            if  0 <= row < self.nrow():
+                return self._getelevation(row)
+
+    def get_azimith(self, row=-1):
+        """
+        Get a list of azimuths for the observations.
+        Return a float for each integration in the scantable.
+        Parameters:
+            row:    row no of integration. Default -1 return all rows
+        Example:
+            none
+        """
+        out = []
+        if row == -1:
+            return [self._getazimuth(i) for i in range(self.nrow())]
+        else:
+            if  0 <= row < self.nrow():
+                return self._getazimuth(row)
+
+    def get_parangle(self, row=-1):
+        """
+        Get a list of parallactic angles for the observations.
+        Return a float for each integration in the scantable.
+        Parameters:
+            row:    row no of integration. Default -1 return all rows
+        Example:
+            none
+        """
+        out = []
+        if row == -1:
+            return [self._getparangle(i) for i in range(self.nrow())]
+        else:
+            if  0 <= row < self.nrow():
+                return self._getparangle(row)
 
     def set_unit(self, unit='channel'):

branches/Release12/src/SDMemTable.cc

@@ -244 +244 @@
   srcnCol_.get(whichRow, name);
   return name;
+}
+
+float SDMemTable::getElevation(Int whichRow) const
+{
+  float elevation;
+  elCol_.get(whichRow, elevation);
+  return elevation;
+}
+
+float SDMemTable::getAzimuth(Int whichRow) const
+{
+  float azimuth;
+  azCol_.get(whichRow, azimuth);
+  return azimuth;
+}
+
+float SDMemTable::getParAngle(Int whichRow) const
+{
+  float parangle;
+  paraCol_.get(whichRow, parangle);
+  return parangle;
 }
 

branches/Release12/src/SDMemTable.h

@@ -147 +147 @@
 
   std::string getSourceName(casa::Int whichRow=0) const;
+
+  float getElevation(casa::Int whichRow=0) const;
+  float getAzimuth(casa::Int whichRow=0) const;
+  float getParAngle(casa::Int whichRow=0) const;
+
   double getInterval(casa::Int whichRow=0) const;
 

branches/Release12/src/SDMemTableWrapper.h

@@ -136 +136 @@
   std::string getSourceName(int whichRow=0) {
     return table_->getSourceName(whichRow);
+  }
+
+  float getElevation(int whichRow=0) {
+    return table_->getElevation(whichRow);
+  }
+  float getAzimuth(int whichRow=0) {
+    return table_->getAzimuth(whichRow);
+  }
+  float getParAngle(int whichRow=0) {
+    return table_->getParAngle(whichRow);
   }
 

branches/Release12/src/python_SDMemTable.cc

@@ -93 +93 @@
     .def("_getsourcename", &SDMemTableWrapper::getSourceName,
          (boost::python::arg("whichRow")=0) )
+    .def("_getelevation", &SDMemTableWrapper::getElevation,
+         (boost::python::arg("whichRow")=0) )
+    .def("_getazimuth", &SDMemTableWrapper::getAzimuth,
+         (boost::python::arg("whichRow")=0) )
+    .def("_getparangle", &SDMemTableWrapper::getParAngle,
+         (boost::python::arg("whichRow")=0) )
     .def("_gettime", &SDMemTableWrapper::getTime,
          (boost::python::arg("whichRow")=0) )