Changes in trunk/python/asapmath.py [2952:2646]

File:

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

trunk/python/asapmath.py

@@ -1 @@
-import re
 from asap.scantable import scantable
 from asap.parameters import rcParams
@@ -91 +90 @@
     else:
         #s = scantable(stm._average(alignedlst, mask, weight.upper(), scanav))
-        s = scantable(stm._new_average(alignedlst, compel, mask, 
-                                       weight.upper(), scanav))
+        s = scantable(stm._new_average(alignedlst, compel, mask, weight.upper(), scanav))
     s._add_history("average_time",varlist)
 
@@ -393 +391 @@
             p.quit()
             del p
-            return scantab
+            return scabtab
         p.quit()
         del p
@@ -613 +611 @@
             p.quit()
             del p
-            return scantab
+            return scabtab
         p.quit()
         del p
@@ -816 +814 @@
             p.quit()
             del p
-            return scantab
+            return scabtab
         p.quit()
         del p
@@ -824 +822 @@
 
 @asaplog_post_dec
-def merge(*args, **kwargs):
+def merge(*args):
     """
     Merge a list of scanatables, or comma-sperated scantables into one
@@ -830 +828 @@
     Parameters:
         A list [scan1, scan2] or scan1, scan2.
-        freq_tol: frequency tolerance for merging IFs. numeric values
-                  in units of Hz (1.0e6 -> 1MHz) and string ('1MHz')
-                  is allowed.
     Example:
         myscans = [scan1, scan2]
@@ -838 +833 @@
         # or equivalent
         sameallscans = merge(scan1, scan2)
-        # with freqtol
-        allscans = merge(scan1, scan2, freq_tol=1.0e6)
-        # or equivalently
-        allscans = merge(scan1, scan2, freq_tol='1MHz')
     """
     varlist = vars()
@@ -850 +841 @@
     else:
         lst = tuple(args)
-    if kwargs.has_key('freq_tol'):
-        freq_tol = str(kwargs['freq_tol'])
-        if len(freq_tol) > 0 and re.match('.+[GMk]Hz$', freq_tol) is None:
-            freq_tol += 'Hz'
-    else:
-        freq_tol = ''
     varlist["args"] = "%d scantables" % len(lst)
     # need special formatting her for history...
@@ -864 +849 @@
             msg = "Please give a list of scantables"
             raise TypeError(msg)
-    s = scantable(stm._merge(lst, freq_tol))
+    s = scantable(stm._merge(lst))
     s._add_history("merge", varlist)
     return s
@@ -964 +949 @@
 
 @asaplog_post_dec
-def splitant(filename, outprefix='',overwrite=False, getpt=True):
+def splitant(filename, outprefix='',overwrite=False):
     """
     Split Measurement set by antenna name, save data as a scantables,
-    and return a list of filename. Note that frequency reference frame
-    is imported as it is in Measurement set.
+    and return a list of filename.
     Notice this method can only be available from CASA.
     Prameter
@@ -979 +963 @@
                     The default False is to return with warning
                     without writing the output. USE WITH CARE.
-       getpt        Whether to import direction from MS/POINTING
-                    table or not. Default is True (import direction).
+
     """
     # Import the table toolkit from CASA
-    from taskinit import gentools
+    from casac import casac
     from asap.scantable import is_ms
-    tb = gentools(['tb'])[0]
+    tb = casac.table()
     # Check the input filename
     if isinstance(filename, str):
@@ -995 +978 @@
             raise IOError(s)
         # check if input file is MS
+        #if not os.path.isdir(filename) \
+        #       or not os.path.exists(filename+'/ANTENNA') \
+        #       or not os.path.exists(filename+'/table.f1'):
         if not is_ms(filename):
             s = "File '%s' is not a Measurement set." % (filename)
@@ -1010 +996 @@
     tb.open(tablename=filename,nomodify=True)
     ant1=tb.getcol('ANTENNA1',0,-1,1)
+    #anttab=tb.getkeyword('ANTENNA').split()[-1]
     anttab=tb.getkeyword('ANTENNA').lstrip('Table: ')
     tb.close()
+    #tb.open(tablename=filename+'/ANTENNA',nomodify=True)
     tb.open(tablename=anttab,nomodify=True)
     nant=tb.nrows()
     antnames=tb.getcol('NAME',0,nant,1)
     tb.close()
+    tmpname='asapmath.splitant.tmp'
     for antid in set(ant1):
-        scan=scantable(filename,average=False,antenna=int(antid),getpt=getpt)
+        tb.open(tablename=filename,nomodify=True)
+        tbsel=tb.query('ANTENNA1 == %s && ANTENNA2 == %s'%(antid,antid),tmpname)
+        scan=scantable(tmpname,average=False,getpt=True,antenna=int(antid))
         outname=prefix+antnames[antid]+'.asap'
         scan.save(outname,format='ASAP',overwrite=overwrite)
+        tbsel.close()
+        tb.close()
+        del tbsel
         del scan
         outfiles.append(outname)
+        os.system('rm -rf '+tmpname)
+    del tb
     return outfiles
 
 @asaplog_post_dec
-def _array2dOp( scan, value, mode="ADD", tsys=False, insitu=None, skip_flaggedrow=False):
+def _array2dOp( scan, value, mode="ADD", tsys=False, insitu=None):
     """
     This function is workaround on the basic operation of scantable
@@ -1036 +1032 @@
     insitu:  if False, a new scantable is returned.
              Otherwise, the array operation is done in-sitsu.
-    skip_flaggedrow: skip operation for row-flagged spectra.
     """
     if insitu is None: insitu = rcParams['insitu']
@@ -1045 +1040 @@
     stm._setinsitu(insitu)
     if len( value ) == 1:
-        s = scantable( stm._arrayop( scan, value[0], mode, tsys, skip_flaggedrow ) )
+        s = scantable( stm._arrayop( scan, value[0], mode, tsys ) )
     elif len( value ) != nrow:
         raise ValueError( 'len(value) must be 1 or conform to scan.nrow()' )
@@ -1063 +1058 @@
             s.set_selection( sel )
             if len( value[irow] ) == 1:
-                stm._unaryop( s, value[irow][0], mode, tsys, skip_flaggedrow )
+                stm._unaryop( s, value[irow][0], mode, tsys )
             else:
                 #stm._arrayop( s, value[irow], mode, tsys, 'channel' )
-                stm._arrayop( s, value[irow], mode, tsys, skip_flaggedrow )
+                stm._arrayop( s, value[irow], mode, tsys )
         s.set_selection(basesel)
     return s