Changeset 1686 for branches/alma

Timestamp:

02/08/10 16:22:11 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready to Release: Yes

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...

Changed splitant() to use new scantable constructor.

File:

• branches/alma/python/asapmath.py (modified) (3 diffs)

branches/alma/python/asapmath.py

@@ -950 +950 @@
     # Import the table toolkit from CASA
     try:
-        import casac
+       import casac
     except ImportError:
-        if rcParams['verbose']:
-            #print "failed to load casa"
-            print_log()
-            asaplog.push("failed to load casa")
-            print_log('ERROR')
-        else: raise
-        return False
+       if rcParams['verbose']:
+           #print "failed to load casa"
+           print_log()
+           asaplog.push("failed to load casa")
+           print_log('ERROR')
+       else: raise
+       return False
     try:
-        tbtool = casac.homefinder.find_home_by_name('tableHome')
-        tb = tbtool.create()
-        tb2 = tbtool.create()
+       tbtool = casac.homefinder.find_home_by_name('tableHome')
+       tb = tbtool.create()
+       tb2 = tbtool.create()
     except:
-        if rcParams['verbose']:
-            #print "failed to load a table tool:\n", e
-            print_log()
-            asaplog.push("failed to load table tool")
-            print_log('ERROR')
-        else: raise
-        return False
+       if rcParams['verbose']:
+           #print "failed to load a table tool:\n", e
+           print_log()
+           asaplog.push("failed to load table tool")
+           print_log('ERROR')
+       else: raise
+       return False
     # Check the input filename
     if isinstance(filename, str):
@@ -1007 +1007 @@
     if len(outprefix) > 0: prefix=outprefix+'.'
     else:
-        prefix=filename
+        prefix=filename.rstrip('/')
     # Now do the actual splitting.
     outfiles=[]
-    tmpms="temp_antsplit.ms"
-    if os.path.exists(tmpms):
-        ans=raw_input('Temporal file '+tmpms+' exists. Delete it and continue? [y/N]: ')
-        if ans.upper() == 'Y':
-            os.system('rm -rf '+tmpms)
-            asaplog.push('The file '+tmpms+' deleted.')
-        else:
-            asaplog.push('Exit without splitting.')
-            return
     tb.open(tablename=filename+'/ANTENNA',nomodify=True)
     nant=tb.nrows()
@@ -1026 +1017 @@
     tb.open(tablename=filename,nomodify=True)
     ant1=tb.getcol('ANTENNA1',0,-1,1)
+    tb.close()
     for antid in set(ant1):
-        qstr="ANTENNA1 == "+str(antid)
-        stab = tb.queryC(qstr)
-        ctab = stab.copy(tmpms,deep=True)
-        stab.close()
-        ctab.close()
-        scan=scantable(tmpms,average=False,getpt=True)
+        scan=scantable(filename,average=False,getpt=True,antenna=int(antid))
         outname=prefix+antnames[antid]+'.asap'
         scan.save(outname,format='ASAP',overwrite=overwrite)
-        # Modify scantable header
-        tb2.open(tablename=outname,nomodify=False)
-        tb2.putkeyword(keyword='AntennaName',value=antnames[antid])
-        tb2.putkeyword(keyword='AntennaPosition',value=antpos[antid])
-        tb2.flush()
-        tb2.close()
-        del scan, ctab, stab
+        del scan
         outfiles.append(outname)
-    tb.close()
     del tb, tb2
-    os.system('rm -rf '+tmpms)
     return outfiles