Changeset 1826 for trunk/python/asapmath.py

Timestamp:

08/03/10 11:41:13 (14 years ago)

Author:

Malte Marquarding

Message:

Tidy up of imports (now imported from asap.). Also fixed some whitespace/tab issues

File:

• trunk/python/asapmath.py (modified) (11 diffs)

trunk/python/asapmath.py

@@ -1 +1 @@
 from asap.scantable import scantable
-from asap import rcParams
-from asap import print_log, print_log_dec
-from asap import selector
-from asap import asaplog
+from asap.paramaters import rcParams
+from asap.logging import asaplog, print_log, print_log_dec
+from asap.selector import selector
 from asap import asaplotgui
 
@@ -937 +936 @@
     """
     Calibrate data.
-    
+
     Parameters:
         scantab:       scantable
         scannos:       list of scan number
         calmode:       calibration mode
-        verify:        verify calibration     
+        verify:        verify calibration
     """
     antname = scantab.get_antennaname()
@@ -979 +978 @@
         scal = scantab.copy()
 
-    return scal 
+    return scal
 
 def apexcal( scantab, scannos=[], calmode='none', verify=False ):
@@ -990 +989 @@
         calmode:       calibration mode
 
-        verify:        verify calibration     
+        verify:        verify calibration
     """
     from asap._asap import stmath
@@ -1008 +1007 @@
         calmode:       calibration mode
 
-        verify:        verify calibration     
+        verify:        verify calibration
     """
     from asap._asap import stmath
@@ -1020 +1019 @@
     Split Measurement set by antenna name, save data as a scantables,
     and return a list of filename.
-    Notice this method can only be available from CASA. 
+    Notice this method can only be available from CASA.
     Prameter
-       filename:    the name of Measurement set to be read. 
+       filename:    the name of Measurement set to be read.
        outprefix:   the prefix of output scantable name.
                     the names of output scantable will be
@@ -1030 +1029 @@
                     The default False is to return with warning
                     without writing the output. USE WITH CARE.
-                    
+
     """
     # Import the table toolkit from CASA
@@ -1071 +1070 @@
         if not os.path.isdir(filename) \
                or not os.path.exists(filename+'/ANTENNA') \
-               or not os.path.exists(filename+'/table.f1'): 
+               or not os.path.exists(filename+'/table.f1'):
             s = "File '%s' is not a Measurement set." % (filename)
             if rcParams['verbose']:
@@ -1119 +1118 @@
     value:   float list operand
     mode:    operation mode (ADD, SUB, MUL, DIV)
-    tsys:    if True, operate tsys as well 
+    tsys:    if True, operate tsys as well
     """
     nrow = scan.nrow()
@@ -1134 +1133 @@
         from asap._asap import stmath
         stm = stmath()
-        # insitu must be True 
+        # insitu must be True
         stm._setinsitu( True )
         s = scan.copy()
@@ -1150 +1149 @@
         del stm
     return s
-
-            
-