Changeset 1673 for branches/alma/python

Timestamp:

01/13/10 12:50:13 (15 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-1799

Ready to Release: No

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Calibration algorithm for ALMA data (data from OSF) is updated.

Location:

branches/alma/python

Files:

• asapmath.py (modified) (4 diffs)
• scantable.py (modified) (1 diff)

branches/alma/python/asapmath.py

@@ -872 +872 @@
         asaplog.push( 'Calibrating %s position-switched data.' % antname )
         print_log()
-        if ( antname.find( 'APEX' ) != -1 or antname.find( 'ALMA' ) != -1 ):
+        if ( antname.find( 'APEX' ) != -1 ):
+            scal = apexcal( scantab, scannos, calmode, verify )
+        elif ( antname.find( 'ALMA' ) != -1 or antname.find( 'OSF' ) != -1 ):
             scal = almacal( scantab, scannos, calmode, verify )
         else:
@@ -879 +881 @@
         asaplog.push( 'Calibrating %s frequency-switched data.' % antname )
         print_log()
-        if ( antname.find( 'APEX' ) != -1 or antname.find( 'ALMA' ) != -1 ):
+        if ( antname.find( 'APEX' ) != -1 ):
+            scal = apexcal( scantab, scannos, calmode, verify )
+        elif ( antname.find( 'ALMA' ) != -1 or antname.find( 'OSF' ) != -1 ):
             scal = almacal( scantab, scannos, calmode, verify )
         else:
@@ -893 +897 @@
     return scal 
 
-def almacal( scantab, scannos=[], calmode='none', verify=False ):
-    """
-    Calibrate APEX and ALMA data
+def apexcal( scantab, scannos=[], calmode='none', verify=False ):
+    """
+    Calibrate APEX data
 
     Parameters:
@@ -909 +913 @@
     ssub = scantab.get_scan( scannos )
     scal = scantable( stm.cwcal( ssub, calmode, antname ) )
+    return scal
+
+def almacal( scantab, scannos=[], calmode='none', verify=False ):
+    """
+    Calibrate ALMA data
+
+    Parameters:
+        scantab:       scantable
+        scannos:       list of scan number
+        calmode:       calibration mode
+
+        verify:        verify calibration     
+    """
+    from asap._asap import stmath
+    stm = stmath()
+    ssub = scantab.get_scan( scannos )
+    scal = scantable( stm.almacal( ssub, calmode ) )
     return scal
 

branches/alma/python/scantable.py

@@ -38 +38 @@
             average = rcParams['scantable.autoaverage']
         if getpt is None:
-            getpt = False
+            getpt = True
         varlist = vars()
         from asap._asap import stmath