Changeset 2897 for trunk

Timestamp:

02/24/14 13:22:48 (11 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: Yes

Module(s): sd.scantable

Description: fixed a bug that sd.scantable.parse_spw_selection() failed when doppler not given.

File:

• trunk/python/scantable.py (modified) (5 diffs)

trunk/python/scantable.py

@@ -1337 +1337 @@
 
     @asaplog_post_dec
+    def get_doppler(self):
+        """\
+        Get the doppler.
+        """
+        return self._getcoordinfo()[2]
+    
+    @asaplog_post_dec
     def set_doppler(self, doppler='RADIO'):
         """\
@@ -1841 +1848 @@
                                               specified velocity range in
                                               spw 1.
+            restfreq: the rest frequency.
+                     examples: '115.2712GHz', 115271201800.0
+            frame:   an optional frame type, default 'LSRK'. Valid frames are:
+                     'TOPO', 'LSRD', 'LSRK', 'BARY',
+                     'GEO', 'GALACTO', 'LGROUP', 'CMB'
+            doppler: one of 'RADIO', 'OPTICAL', 'Z', 'BETA', 'GAMMA'
         Returns:
         A dictionary of selected (valid) spw and masklist pairs,
@@ -1857 +1870 @@
             set_restfreq(self, restfreq)
 
-        orig_coord   = self._getcoordinfo()
+        orig_coord = self._getcoordinfo()
 
         if frame is not None:
@@ -1866 +1879 @@
             orig_doppler = orig_coord[2]
             self.set_doppler(doppler)
-        """
-        if frame is None: frame = orig_frame
-        self.set_freqframe(frame)
-
-        if doppler is None: doppler = orig_doppler
-        self.set_doppler(doppler)
-        """
         
         valid_ifs = self.getifnos()
@@ -2106 +2112 @@
                                     restf = self.get_restfreqs().values()[0][0]
                                     (expr_v0, expr_v1) = get_velocity_by_string(expr0, expr1)
-                                    expr_f0 = get_frequency_by_velocity(restf, expr_v0, doppler)
-                                    expr_f1 = get_frequency_by_velocity(restf, expr_v1, doppler)
+                                    dppl = self.get_doppler()
+                                    expr_f0 = get_frequency_by_velocity(restf, expr_v0, dppl)
+                                    expr_f1 = get_frequency_by_velocity(restf, expr_v1, dppl)
                                     expr_p0 = coord.to_pixel(expr_f0)
                                     expr_p1 = coord.to_pixel(expr_f1)