Changeset 2889 for trunk

Timestamp:

12/27/13 18:22:06 (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:

Module(s): sd

Description: modified scantable.get_frequency_by_velocity() so that doppler parameter is correctly treated.

File:

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

trunk/python/scantable.py

@@ -363 +363 @@
     return (res1, res2)
 
-def get_frequency_by_velocity(restfreq, vel):
+def get_frequency_by_velocity(restfreq, vel, doppler):
     # vel is in unit of km/s
 
@@ -371 +371 @@
     import math
     r = vel / vel_c
-    return restfreq * math.sqrt((1.0 - r) / (1.0 + r))
+
+    if doppler.lower() == 'radio':
+        return restfreq * (1.0 - r)
+    if doppler.lower() == 'optical':
+        return restfreq / (1.0 + r)
+    else:
+        return restfreq * math.sqrt((1.0 - r) / (1.0 + r))
 
 
@@ -1932 +1938 @@
             if len(spw_list) == 0:
                 raise ValueError("No valid spw in given range.")
-            """
-            no_valid_spw = True
-            for spw in spw_list:
-                print spw_list
-                if spw in valid_ifs:
-                    no_valid_spw = False
-                else:
-                    spw_list.remove(spw)
-
-            if no_valid_spw:
-                raise ValueError("No valid spw in given range.")
-            """
             
             # parse channel expression and store the result in crange_list.
@@ -2012 +2006 @@
                                     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)
-                                    expr_f1 = get_frequency_by_velocity(restf, expr_v1)
+                                    expr_f0 = get_frequency_by_velocity(restf, expr_v0, doppler)
+                                    expr_f1 = get_frequency_by_velocity(restf, expr_v1, doppler)
                                     expr_p0 = coord.to_pixel(expr_f0)
                                     expr_p1 = coord.to_pixel(expr_f1)
@@ -2080 +2074 @@
 
         return res
-    
+    # doppler
 ##################################