Changeset 2375 for trunk/python

Timestamp:

12/19/11 19:40:37 (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...

Several bug fixes and updates

• fixed misunderstanding of array shape when getting data
• load flag data as Int (originally uChar/uInt) at the beginning of gridding
• do not plot observed position and grid position by default
• use Array (instead of Vector/Matrix/Cube) as much as possible

File:

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

trunk/python/asapgrid.py

@@ -42 +42 @@
         self.outfile = self.gridder._save( outfile ) 
 
-    def plot( self, plotchan=-1, plotpol=-1 ):
+    def plot( self, plotchan=-1, plotpol=-1, plotobs=False, plotgrid=False ):
         import time
         t0=time.time()
@@ -49 +49 @@
         rcParams['scantable.storage'] = 'disk'
         plotter = _SDGridPlotter( self.infile, self.outfile, self.ifno )
-        plotter.plot( chan=plotchan, pol=plotpol )
+        plotter.plot( chan=plotchan, pol=plotpol, plotobs=plotobs, plotgrid=plotgrid )
         # back to original setup
         rcParams['scantable.storage'] = storg
@@ -123 +123 @@
         #print 'cellx,celly=',self.cellx,self.celly
 
-    def plot( self, chan=-1, pol=-1 ):
+    def plot( self, chan=-1, pol=-1, plotobs=False, plotgrid=False ):
         if pol < 0:
             opt = 'averaged over pol'
@@ -137 +137 @@
         pl.clf()
         # plot grid position
-        x = numpy.arange(self.blc[0],self.trc[0]+0.5*self.cellx,self.cellx,dtype=float)
-        #print 'len(x)=',len(x)
-        #print 'x=',x
-        ybase = numpy.ones(self.nx,dtype=float)*self.blc[1]
-        #print 'len(ybase)=',len(ybase)
-        incr = self.celly 
-        for iy in xrange(self.ny):
-            y = ybase + iy * incr
-            #print y
-            pl.plot(x,y,',',color='blue')
+        if plotgrid:
+            x = numpy.arange(self.blc[0],self.trc[0]+0.5*self.cellx,self.cellx,dtype=float)
+            #print 'len(x)=',len(x)
+            #print 'x=',x
+            ybase = numpy.ones(self.nx,dtype=float)*self.blc[1]
+            #print 'len(ybase)=',len(ybase)
+            incr = self.celly 
+            for iy in xrange(self.ny):
+                y = ybase + iy * incr
+                #print y
+                pl.plot(x,y,',',color='blue')
         # plot observed position
-        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
+        if plotobs:
+            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,