Changeset 1880

Timestamp:

08/20/10 12:53:05 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: 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...

An implementation of asapmath.splitant() is changed since
the new filler doesn't support antenna parameter at the
moment.

The default behavior of MS filler also changed.

Location:

trunk

Files:

• external-alma/atnf/PKSIO/PKSMS2reader.cc (modified) (1 diff)
• python/asapmath.py (modified) (2 diffs)
• src/PKSFiller.cpp (modified) (1 diff)

trunk/external-alma/atnf/PKSIO/PKSMS2reader.cc

@@ -101 +101 @@
   if ( antenna.length() == 0 ) {
     cAntId.resize( 1 ) ;
-    cAntId[0] = 0 ;
+    //cAntId[0] = 0 ;
+    ROScalarColumn<Int> ant1Col( cPKSMS, "ANTENNA1" ) ;
+    cAntId[0] = ant1Col(0) ;
   }
   else {

trunk/python/asapmath.py

@@ -945 +945 @@
     """
     # Import the table toolkit from CASA
-
     import casac
     tbtool = casac.homefinder.find_home_by_name('tableHome')
     tb = tbtool.create()
-    tb2 = tbtool.create()
     # Check the input filename
     if isinstance(filename, str):
@@ -973 +971 @@
         prefix=filename.rstrip('/')
     # Now do the actual splitting.
+    # 2010/08/20 TN
+    # The antenna parameter for scantable constructor is ineffective at the moemnt.
+    # Thus, we should go back to original implementation of splitant.
+##     outfiles=[]
+##     tb.open(tablename=filename+'/ANTENNA',nomodify=True)
+##     nant=tb.nrows()
+##     antnames=tb.getcol('NAME',0,nant,1)
+##     antpos=tb.getcol('POSITION',0,nant,1).transpose()
+##     tb.close()
+##     tb.open(tablename=filename,nomodify=True)
+##     ant1=tb.getcol('ANTENNA1',0,-1,1)
+##     tb.close()
+##     for antid in set(ant1):
+##         scan=scantable(filename,average=False,getpt=True,antenna=int(antid))
+##         outname=prefix+antnames[antid]+'.asap'
+##         scan.save(outname,format='ASAP',overwrite=overwrite)
+##         del scan
+##         outfiles.append(outname)
     outfiles=[]
     tb.open(tablename=filename+'/ANTENNA',nomodify=True)
     nant=tb.nrows()
     antnames=tb.getcol('NAME',0,nant,1)
-    antpos=tb.getcol('POSITION',0,nant,1).transpose()
     tb.close()
     tb.open(tablename=filename,nomodify=True)
     ant1=tb.getcol('ANTENNA1',0,-1,1)
-    tb.close()
+    tmpname='asapmath.splitant.tmp'
     for antid in set(ant1):
-        scan=scantable(filename,average=False,getpt=True,antenna=int(antid))
+        tbsel=tb.query('ANTENNA1 == %s && ANTENNA2 == %s'%(antid,antid))
+        tbsel.copy(tmpname,deep=True)
+        #tbsel=tb.query('ANTENNA1 == %s && ANTENNA2 == %s'%(antid,antid),tmpname)
+        tbsel.close()
+        del tbsel
+        scan=scantable(tmpname,average=False,getpt=True,antenna=int(antid))
         outname=prefix+antnames[antid]+'.asap'
         scan.save(outname,format='ASAP',overwrite=overwrite)
         del scan
         outfiles.append(outname)
-    del tb, tb2
+        os.system('rm -rf '+tmpname)
+    tb.close()
+    del tb
     return outfiles
 

trunk/src/PKSFiller.cpp

@@ -74 +74 @@
   Vector<uInt> nchans,npols;
 
-  String antenna("0");
+  String antenna("");
 
   reader_ = getPKSreader(inName, antenna, 0, 0, format, beams, ifs,