Changeset 2390 for trunk/python

Timestamp:

12/28/11 16:51:43 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2816

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

More than one input data are supported.

File:

• trunk/python/asapgrid.py (modified) (6 diffs)

trunk/python/asapgrid.py

@@ -9 +9 @@
 class asapgrid:
     def __init__( self, infile ):
-        self.infile = infile
         self.outfile = None
-        self.gridder = stgrid( self.infile )
         self.ifno = None
+        self.gridder = stgrid()
+        self.setData( infile )
 
     def setData( self, infile ):
-        self.gridder._setin( infile )
+        if isinstance( infile, str ):
+            self.gridder._setin( infile )
+        else:
+            self.gridder._setfiles( infile )
+        self.infile = infile 
 
     def setIF( self, ifno ):
@@ -58 +62 @@
 class _SDGridPlotter:
     def __init__( self, infile, outfile=None, ifno=-1 ):
-        self.infile = infile
+        if isinstance( infile, str ):
+            self.infile = [infile]
+        else:
+            self.infile = infile
         self.outfile = outfile
         if self.outfile is None:
-            self.outfile = self.infile.rstrip('/')+'.grid'
+            self.outfile = self.infile[0].rstrip('/')+'.grid'
         self.nx = -1
         self.ny = -1
@@ -138 +145 @@
         # plot observed position
         if plotobs:
-            self.createTableIn()
-            irow = 0 
-            while ( irow < self.nrow ):
-                chunk = self.getPointingChunk( irow )
-                #print chunk
-                pl.plot(chunk[0],chunk[1],',',color='green')
-                irow += chunk.shape[1]
-                #print irow
+            for i in xrange(len(self.infile)):
+                self.createTableIn( self.infile[i] )
+                irow = 0 
+                while ( irow < self.nrow ):
+                    chunk = self.getPointingChunk( irow )
+                    #print chunk
+                    pl.plot(chunk[0],chunk[1],',',color='green')
+                    irow += chunk.shape[1]
+                    #print irow
         # show image
         extent=[self.blc[0]-0.5*self.cellx,
@@ -157 +165 @@
         pl.title( title )
 
-    def createTableIn( self ):
-        self.tablein = scantable( self.infile, average=False )
+    def createTableIn( self, tab ):
+        del self.tablein
+        self.tablein = scantable( tab, average=False )
         if self.ifno < 0:
             ifno = self.tablein.getif(0)
@@ -166 +175 @@
         sel = selector()
         sel.set_ifs( ifno )
-        self.tablein.set_selection( sel ) 
+        self.tablein.set_selection( sel )
         self.nchan = len(self.tablein._getspectrum(0))
-        self.nrow = self.tablein.nrow() 
+        self.nrow = self.tablein.nrow()
         del sel
         
@@ -195 +204 @@
         else:
             retval = data[pol]
-        #retval[0][self.nx-1] = -1.0
         return retval