Changeset 1600

Timestamp:

07/08/09 16:30:04 (15 years ago)

Author:

Malte Marquarding

Message:

Ticket #170: python derived class for nice access e.g. units and doc strings

Location:

trunk

Files:

• doc/CHANGELOG (modified) (4 diffs)
• python/coordinate.py (added)
• python/scantable.py (modified) (2 diffs)
• src/STCoordinate.h (modified) (1 diff)
• test/test_scantable.py (modified) (3 diffs)

trunk/doc/CHANGELOG

@@ -2 +2 @@
 =========
 
-Release 2.4.0 []
+Release 3.0.0 []
 
 * Ticket #155 Better output filenames. Ignore non-existsing beams/pols/ifs/scans
@@ -11 +11 @@
 * Ticket #163 fixed for scantable.set_sourcetype
 * Ticket #164 Upgrade note in wiki FAQ
+* Ticket #165 Handle non-parallactified polarimtery data (if supported in rpfits)
 * Ticket #167 Added running polynomial filter to scantable.smooth
-* Ticket #168 Data exported vi scnatable.save now contains correct frequency
-  or velocity information
+* Ticket #168 Data exported via scantable.save now contains correct frequency
+              or velocity information
 * Ticket #169 Simplified selection of data
-* Ticket #46  Interactive lag flagging 
-
+* Ticket #46  Interactive lag flagging
+* Ticket #170 Provided access to frequency coordinate information via
+              scantable.get_coordinate
 * Added OS X 10.5 Disk image installer
 * Interactive plotting annotations via optional argument interactive=True
@@ -35 +37 @@
 * Ticket #149 Fixed the bug causing spectral line search to go into an infinite loop
    in some rare circumstances
-* Ticket #110 Added export to CLASS readable FITS files 
+* Ticket #110 Added export to CLASS readable FITS files
    scantable.save("myfile.fits", "CLASS")
 * Ticket #142 Fix of the frequency alignment for long observations
 * Ticket #133 allow supression of history in the scantable via rc parameters
-* Ticket #109 source direction for Hobart data 
-* Ticket #115 added running median to scantable.(smooth(kernel='rmedian') 
+* Ticket #109 source direction for Hobart data
+* Ticket #115 added running median to scantable.(smooth(kernel='rmedian')
 * Ticket #148 opacity correction wasn't applied to TSYS
 * Ticket #135 quotient detection failure for specific source names
@@ -76 +78 @@
 * fix for Ticket #88 - numpy masks
 * better TAB completion for ipython (handles quotes, don't list private members)
-* Fix for Ticket #81 = scanatble.stats output as list 
+* Fix for Ticket #81 = scanatble.stats output as list
 * ticket #64 - speed up of auto_poly_baseline
 * fix for ticket #89 - export of IF sub-selections

trunk/python/scantable.py

@@ -5 +5 @@
 from asap import selector
 from asap import linecatalog
+from asap.coordinate import coordinate
 from asap import _n_bools, mask_not, mask_and, mask_or
 
@@ -293 +294 @@
         assert(len(spec) == self.nchan())
         return self._setspectrum(spec, rowno)
+
+    def get_coordinate(self, rowno):
+        """Return the (spectral) coordinate for a a given 'rowno'.
+        NOTE:
+            * This coordinate is only valid until a scantable method modifies
+              the frequency axis.
+            * This coordinate does contain the original frequency set-up
+              NOT the new frame. The conversions however are done using the user
+              specified frame (e.g. LSRK/TOPO). To get the 'real' coordinate,
+              use scantable.freq_align first. Without it there is no closure,
+              i.e.
+              c = myscan.get_coordinate(0)
+              c.to_frequency(c.get_reference_pixel()) != c.get_reference_value()
+
+        Parameters:
+             rowno:    the row number for the spectral coordinate
+
+        """
+        return coordinate(Scantable.get_coordinate(self, rowno))
 
     def get_selection(self):

trunk/src/STCoordinate.h

@@ -25 +25 @@
   public:
     STCoordinate() {};
+
+    STCoordinate(const STCoordinate& other) : spec_(other.spec_) {};
+
     STCoordinate(const casa::SpectralCoordinate& spec) :
       spec_(spec) {};

trunk/test/test_scantable.py

@@ -1 +1 @@
 import unittest
+import datetime
 from asap import scantable, selector, rcParams
 rcParams["verbose"] = False
@@ -57 +58 @@
         sel1 = self.st.get_selection()
         self.assertEqual(sel1.get_pols(), [1])
+        self.st.set_selection(pols="XX")
+        self.assertEqual(self.st.getpolnos(), (0,))
 
     def test_stats(self):
@@ -83 +86 @@
         self.assertEqual(self.st.get_column_names(), cnames)
 
+    def test_get_tsys(self):
+        self.assertAlmostEqual(self.st.get_tsys()[0], 175.830429077)
+
+    def test_get_time(self):
+        self.assertEqual(self.st.get_time(0), '2008/03/12/09:32:50')
+        dt = datetime.datetime(2008,3,12,9,32,50)
+        self.assertEqual(self.st.get_time(0, True), dt)
+
+    def test_get_inttime(self):
+        self.assertAlmostEqual(self.st.get_inttime()[0], 30.720016479)
+
+    def test_get_sourcename(self):
+        self.assertEqual(self.st.get_sourcename(0), 'Orion_SiO_R')
+        self.assertEqual(self.st.get_sourcename()[:2], ['Orion_SiO_R', 'Orion_SiO'])
+
+    def test_get_azimuth(self):
+        self.assertAlmostEqual(self.st.get_azimuth()[0], 5.628767013)
+
+    def test_get_elevation(self):
+        self.assertAlmostEqual(self.st.get_elevation()[0], 1.01711678504)
+
+    def test_get_parangle(self):
+        self.assertAlmostEqual(self.st.get_parangle()[0], 2.5921990871)
+
+    def test_get_direction(self):
+        self.assertEqual(self.st.get_direction()[0], '05:35:14.5 -04.52.29.5')
+
+    def test_get_directionval(self):
+        dv = self.st.get_directionval()[0]
+        self.assertAlmostEqual(dv[0], 1.4627692699)
+        self.assertAlmostEqual(dv[1], -0.0850824415)
+
+    def test_unit(self):
+        self.st.set_unit('')
+        self.st.set_unit('GHz')
+        self.st.set_unit('km/s')
+        self.assertRaises(RuntimeError, self.st.set_unit, 'junk')
+        self.assertEquals(self.st.get_unit(), 'km/s')
+
     def test_average_pol(self):
         ap = self.st.average_pol()
         self.assertEqual(ap.npol(), 1)
 
+    def test_drop_scan(self):
+        s0 = self.st.drop_scan(1)
+        self.assertEqual(s0.getscannos(), (0,))
+        s1 = self.st.drop_scan([0])
+        self.assertEqual(s1.getscannos(), (1,))
+
 
 if __name__ == '__main__':