Changeset 2886 for trunk

Timestamp:

12/25/13 14:50:26 (11 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes CAS-5859

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): sd

Description: modified parse_spw_selection() so that it emits ValueError when invalid spw given.

File:

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

trunk/python/scantable.py

@@ -1814 +1814 @@
                     
                     else: # single number
-                        try:
-                            #checking if the given number is valid for spw ID
-                            idx = valid_ifs.index(int(scs_elem))
-                            spw_list.append(valid_ifs[idx])
+                        #checking if the given number is valid for spw ID
+                        idx = valid_ifs.index(int(scs_elem))
+                        spw_list.append(valid_ifs[idx])
                         
-                        except:
-                            asaplog.post()
-                            asaplog.push("Wrong spw number (" + scs_elem + ") given. ignored.")
-                            asaplog.post("WARNING")
-                
                 else: # (len_product == 2)
                     # namely, one of '<', '>' or '~' appers just once.
@@ -1829 +1823 @@
                     if (lt_sep_length == 2): # '<a'
                         if is_number(lt_sep[1]):
+                            no_valid_spw = True
                             for i in valid_ifs:
                                 if (i < float(lt_sep[1])):
                                     spw_list.append(i)
+                                    no_valid_spw = False
+
+                            if no_valid_spw:
+                                raise ValueError("Invalid spw selection ('<" + str(lt_sep[1]) + "').")
                         
                         else:
-                            RuntimeError("Invalid spw selection.")
+                            raise RuntimeError("Invalid spw selection.")
                         
                     elif (gt_sep_length == 2): # '>a'
                         if is_number(gt_sep[1]):
+                            no_valid_spw = True
                             for i in valid_ifs:
                                 if (i > float(gt_sep[1])):
                                     spw_list.append(i)
+                                    no_valid_spw = False
+                            
+                            if no_valid_spw:
+                                raise ValueError("Invalid spw selection ('>" + str(gt_sep[1]) + "').")
                         
                         else:
-                            RuntimeError("Invalid spw selection.")
+                            raise RuntimeError("Invalid spw selection.")
                         
                     else: # (ti_sep_length == 2) where both boundaries inclusive
@@ -1853 +1857 @@
                             expr_pmin = min(float(expr0), float(expr1))
                             expr_pmax = max(float(expr0), float(expr1))
+                            no_valid_spw = True
+                            
                             for i in valid_ifs:
                                 if (expr_pmin <= i) and (i <= expr_pmax):
                                     spw_list.append(i)
+                                    no_valid_spw = False
+
+                            if no_valid_spw:
+                                raise ValueError("No valid spw in range ('" + str(expr_pmin) + "~" + str(expr_pmax) + "').")
                             
                         elif is_number(expr0) and is_frequency(expr1):
                             # 'a~b*Hz'
                             (expr_f0, expr_f1) = get_freq_by_string(expr0, expr1)
-
+                            no_valid_spw = True
+                            
                             for coord in self._get_coordinate_list():
                                 expr_p0 = coord['coord'].to_pixel(expr_f0)
@@ -1873 +1884 @@
                                 if ((expr_pmax - pmin)*(expr_pmin - pmax) <= 0.0):
                                     spw_list.append(spw)
+                                    no_valid_spw = False
+
+                            if no_valid_spw:
+                                raise ValueError("No valid spw in range ('" + str(expr0) + "~" + str(expr1) + "').")
                                 
                         elif is_number(expr0) and is_velocity(expr1):
@@ -1879 +1894 @@
                             expr_vmin = min(expr_v0, expr_v1)
                             expr_vmax = max(expr_v0, expr_v1)
-
+                            no_valid_spw = True
+                            
                             for coord in self._get_coordinate_list():
                                 spw = coord['if']
@@ -1894 +1910 @@
                                 if ((expr_vmax - vmin)*(expr_vmin - vmax) <= 0.0):
                                     spw_list.append(spw)
+                                    no_valid_spw = False
+
+                            if no_valid_spw:
+                                raise ValueError("No valid spw in range ('" + str(expr0) + "~" + str(expr1) + "').")
                             
                         else:
@@ -2003 +2023 @@
         
         return res
+    #found
 
     @asaplog_post_dec