Changeset 2937 for trunk/python

Timestamp:

04/25/14 14:20:31 (11 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes CAS-6485

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): sd

Description: modified scantable.parse_spw_selection() so that velocity corresponding to the central frequency rather than the centeral value of velocity range is checked in selecting spw via velocity ranges.

File:

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

trunk/python/scantable.py

@@ -2011 +2011 @@
                                 """
 
-                                fhead = coord['coord'].to_frequency(0)
-                                ftail = coord['coord'].to_frequency(self.nchan(spw) - 1)
+                                crd = coord['coord']
+                                fhead = crd.to_frequency(0)
+                                ftail = crd.to_frequency(self.nchan(spw) - 1)
                                 fcen  = (fhead + ftail) / 2.0
 
@@ -2047 +2048 @@
                                 """
 
-                                vhead = coord['coord'].to_velocity(0)
-                                vtail = coord['coord'].to_velocity(self.nchan(spw) - 1)
-                                vcen  = (vhead + vtail) / 2.0
+                                crd = coord['coord']
+                                fhead = crd.to_frequency(0)
+                                ftail = crd.to_frequency(self.nchan(spw) - 1)
+                                fcen  = (fhead + ftail) / 2.0
+                                vcen  = crd.to_velocity(crd.to_pixel(fcen))
 
                                 if ((expr_vmin <= vcen) and (vcen <= expr_vmax)):