Changeset 2936 for trunk

Timestamp:

04/25/14 14:01:44 (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 sd.scantable.parse_spw_selection() so that spectral windows will be selected if center values of their frequency/velocity ranges fall in the range specified.

File:

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

trunk/python/scantable.py

@@ -1835 +1835 @@
                            '0~1:2~6,8' = channels 2 to 6 in spws 0,1, and
                                          all channels in spw8
-                           '1.3~1.5GHz' = all spws that fall in or have at
-                                          least some overwrap with frequency
-                                          range between 1.3GHz and 1.5GHz.
-                           '1.3~1.5GHz:1.3~1.5GHz' = channels that fall
+                           '1.3~1.5GHz' = all spws whose central frequency
+                                          falls in frequency range between
+                                          1.3GHz and 1.5GHz.
+                           '1.3~1.5GHz:1.3~1.5GHz' = channels which fall
                                                      between the specified
                                                      frequency range in spws
-                                                     that fall in or have
-                                                     overwrap with the
-                                                     specified frequency
-                                                     range.
+                                                     whose central frequency
+                                                     falls in the specified
+                                                     frequency range.
                            '1:-200~250km/s' = channels that fall between the
                                               specified velocity range in
@@ -1991 +1990 @@
                             # 'a~b*Hz'
                             (expr_f0, expr_f1) = get_freq_by_string(expr0, expr1)
+                            expr_fmin = min(expr_f0, expr_f1)
+                            expr_fmax = max(expr_f0, expr_f1)
                             no_valid_spw = True
                             
                             for coord in self._get_coordinate_list():
+                                spw = coord['if']
+                                
+                                """
                                 expr_p0 = coord['coord'].to_pixel(expr_f0)
                                 expr_p1 = coord['coord'].to_pixel(expr_f1)
@@ -1999 +2003 @@
                                 expr_pmax = max(expr_p0, expr_p1)
                                 
-                                spw = coord['if']
                                 pmin = 0.0
                                 pmax = float(self.nchan(spw) - 1)
-                                
+
                                 if ((expr_pmax - pmin)*(expr_pmin - pmax) <= 0.0):
                                     spw_list.append(spw)
                                     no_valid_spw = False
-
+                                """
+
+                                fhead = coord['coord'].to_frequency(0)
+                                ftail = coord['coord'].to_frequency(self.nchan(spw) - 1)
+                                fcen  = (fhead + ftail) / 2.0
+
+                                if ((expr_fmin <= fcen) and (fcen <= expr_fmax)):
+                                    spw_list.append(spw)
+                                    no_valid_spw = False
+                                
                             if no_valid_spw:
                                 raise ValueError("No valid spw in range ('" + str(expr0) + "~" + str(expr1) + "').")
@@ -2019 +2031 @@
                             for coord in self._get_coordinate_list():
                                 spw = coord['if']
-                                
+
+                                """
                                 pmin = 0.0
                                 pmax = float(self.nchan(spw) - 1)
@@ -2030 +2043 @@
 
                                 if ((expr_vmax - vmin)*(expr_vmin - vmax) <= 0.0):
+                                    spw_list.append(spw)
+                                    no_valid_spw = False
+                                """
+
+                                vhead = coord['coord'].to_velocity(0)
+                                vtail = coord['coord'].to_velocity(self.nchan(spw) - 1)
+                                vcen  = (vhead + vtail) / 2.0
+
+                                if ((expr_vmin <= vcen) and (vcen <= expr_vmax)):
                                     spw_list.append(spw)
                                     no_valid_spw = False