Changeset 1684 for branches/alma

Timestamp:

02/04/10 20:42:12 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-1810

Ready to Release: Yes

Interface Changes: Yes

What Interface Changed: Added 'antenna' parameter to scantable constructor

Test Programs: List test programs

Put in Release Notes: Yes

Module(s): atnf

Description: Describe your changes here...

I have added 'antenna' parameter to scantable constructor to be able to
select specific antenna from MS data with multiple antenna data.
Currently, only single antenna selection is working. For multiple antenna
selection, only first selection is used.

Location:

branches/alma

Files:

• python/scantable.py (modified) (5 diffs)
• src/STFiller.cpp (modified) (3 diffs)
• src/STFiller.h (modified) (1 diff)

branches/alma/python/scantable.py

@@ -12 +12 @@
     """
 
-    def __init__(self, filename, average=None, unit=None, getpt=None):
+    def __init__(self, filename, average=None, unit=None, getpt=None, antenna=None):
         """
         Create a scantable from a saved one or make a reference
@@ -39 +39 @@
         if getpt is None:
             getpt = True
+        if antenna is None:
+            antenna = ''
+        elif type(antenna) == int:
+            antenna = '%s'%antenna
+        elif type(antenna) == list:
+            tmpstr = ''
+            for i in range( len(antenna) ):
+                if type(antenna[i]) == int: 
+                    tmpstr = tmpstr + ('%s,'%(antenna[i])) 
+                elif type(antenna[i]) == str:
+                    tmpstr=tmpstr+antenna[i]+','
+                else:
+                    asaplog.push('Bad antenna selection.')
+                    print_log('ERROR')
+                    return 
+            antenna = tmpstr.rstrip(',')
         varlist = vars()
         from asap._asap import stmath
@@ -80 +96 @@
                             raise IOError(msg)
                 else:
-                    self._fill([filename], unit, average, getpt)
+                    self._fill([filename], unit, average, getpt, antenna)
             elif (isinstance(filename, list) or isinstance(filename, tuple)) \
                   and isinstance(filename[-1], str):
-                self._fill(filename, unit, average, getpt)
+                self._fill(filename, unit, average, getpt, antenna)
         self._add_history("scantable", varlist)
         print_log()
@@ -2164 +2180 @@
         return (sum(nchans)/len(nchans) == nchans[0])
 
-    def _fill(self, names, unit, average, getpt):
+    def _fill(self, names, unit, average, getpt, antenna):
         import os
         from asap._asap import stfiller
@@ -2192 +2208 @@
             asaplog.push(msg, False)
             print_log()
-            r._open(name, -1, -1, getpt)
+            r._open(name, antenna, -1, -1, getpt)
             r._read()
             if average:

branches/alma/src/STFiller.cpp

@@ -75 +75 @@
   nreader_(0)
 {
-  open(filename, whichIF, whichBeam);
+  open(filename, "", whichIF, whichBeam);
 }
 
@@ -82 +82 @@
   close();
 }
-
-void STFiller::open( const std::string& filename, int whichIF, int whichBeam, casa::Bool getPt )
+  
+void STFiller::open( const std::string& filename, const std::string& antenna, int whichIF, int whichBeam, casa::Bool getPt )
 {
   if (table_.null())  {
@@ -122 +122 @@
   //
 
-  if ( (reader_ = getPKSreader(inName, 0, 0, format, beams, ifs,
+  if ( (reader_ = getPKSreader(inName, antenna, 0, 0, format, beams, ifs,
                               nchans, npols, haveXPol_,haveBase, haveSpectra
                               )) == 0 )  {

branches/alma/src/STFiller.h

@@ -76 +76 @@
    * @exception AipsError Creation of PKSreader failed
    */
-  void open( const std::string& filename, int whichIF=-1, int whichBeam=-1, casa::Bool getPt=casa::False );
+  void open( const std::string& filename, const std::string& antenna, int whichIF=-1, int whichBeam=-1, casa::Bool getPt=casa::False );
 
   /**