Changeset 2360 for trunk/python

Timestamp:

12/06/11 13:13:24 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2816

Ready for Test: No

Interface Changes: Yes

What Interface Changed: Added interface to select polarization

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Polarization selection support.
Default is all polarization components.

File:

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

trunk/python/asapgrid.py

@@ -13 +13 @@
         self.gridder._setin( infile )
 
+    def setPolList( self, pollist ):
+        self.gridder._setpollist( pollist )
+
     def defineImage( self, nx=-1, ny=-1, cellx='', celly='', center='' ):
         self.gridder._defineimage( nx, ny, cellx, celly, center )
@@ -25 +28 @@
         self.outfile = self.gridder._save( outfile ) 
 
-    def plot( self, plotchan=-1 ):
+    def plot( self, plotchan=-1, plotpol=-1 ):
         plotter = _SDGridPlotter( self.infile, self.outfile )
-        plotter.plot( chan=plotchan )
+        plotter.plot( chan=plotchan, pol=plotpol )
         
 class _SDGridPlotter:
@@ -41 +44 @@
         self.ny = -1
         self.nchan = 0
+        self.npol = 0
+        self.pollist = []
         self.cellx = 0.0
         self.celly = 0.0
@@ -57 +62 @@
         del s
 
-        idx = spectra.nonzero()[1]
-        #self.nonzero = self.pointing.take( idx, axis=1 )
-        
         s = scantable( self.outfile, average=False )
-        self.grid = numpy.array( s.get_directionval() ).transpose()
-        dirstring = s.get_direction()
         nrow = s.nrow()
-        spectra = []
+        pols = numpy.ones( nrow, dtype=int )
         for i in xrange(nrow):
-            spectra.append( s._getspectrum( i ) )
-        spectra = numpy.array( spectra ).transpose()
+            pols[i] = s.getpol(i)
+        self.pollist, indices = numpy.unique( pols, return_inverse=True )
+        self.npol = len(self.pollist)
+        self.pollist = self.pollist[indices[:self.npol]]
+        #print 'pollist=',self.pollist
+        #print 'npol=',self.npol
+        #print 'nrow=',nrow
+        dirstring = numpy.array(s.get_direction()).take(range(0,nrow,self.npol))
+        self.grid = numpy.array( s.get_directionval() ).take(range(0,nrow,self.npol),axis=0).transpose()
+        spectra = numpy.zeros( (self.npol,self.nchan,nrow/self.npol), dtype=float )
+        irow = 0 
+        for i in xrange(nrow/self.npol):
+            for ip in xrange(self.npol):
+                spectra[ip,:,i] = s._getspectrum( irow )
+                irow += 1
 
         idx = 0
@@ -73 +86 @@
         while ( dirstring[idx].split()[-1] == d0 ):  
             idx += 1
-
         self.ny = idx
-        self.nx = nrow / idx
+        self.nx = nrow / (self.npol * idx )
+        #print 'nx,ny=',self.nx,self.ny
         
         self.cellx = abs( self.grid[0][0] - self.grid[0][1] )
         self.celly = abs( self.grid[1][0] - self.grid[1][self.ny] )
+        #print 'cellx,celly=',self.cellx,self.celly
 
-        self.data = spectra.reshape( (self.nchan,self.nx,self.ny) )
+        self.data = spectra.reshape( (self.npol,self.nchan,self.nx,self.ny) )
 
-    def plot( self, chan=-1 ):
+    def plot( self, chan=-1, pol=-1 ):
+        if pol < 0:
+            data = self.data.mean(axis=0)
+            opt = 'averaged over pol'
+        else:
+            idx = self.pollist.tolist().index( pol )
+            #print 'idx=',idx
+            data = self.data[idx]
+            opt = 'pol %s'%(pol)
         if chan < 0:
-            data = self.data.mean(axis=0)
-            title = 'Gridded Image (averaged over channel)'
+            data = data.mean(axis=0)
+            opt += ', averaged over channel'
         else:
-            data = self.data[chan]
-            title = 'Gridded Image (channel %s)'%(chan)
+            data = data[chan]
+            opt += ', channel %s'%(chan)
+        title = 'Gridded Image (%s)'%(opt)
         pl.figure(10)
         pl.clf()
         pl.plot(self.grid[0],self.grid[1],'.',color='blue')
         pl.plot(self.pointing[0],self.pointing[1],'.',color='red')
-        #pl.plot(self.nonzero[0],self.nonzero[1],'o',color='green')
         extent=[self.grid[0].min()-0.5*self.cellx,
                 self.grid[0].max()+0.5*self.cellx,