Changeset 2459 for branches/hpc33/python

Timestamp:

04/09/12 18:49:51 (13 years ago)

Author:

Kana Sugimoto

Message:

merged Takeshi's fix to asapgrid and STGrid class form trunk

File:

• branches/hpc33/python/asapgrid.py (modified) (10 diffs, 1 prop)

branches/hpc33/python/asapgrid.py

@@ -105 +105 @@
         numerical value and unit, e.g. '0.5arcmin', or numerical value.
         If those values are specified as numerical value, their units
-        will be assumed to 'arcmin'. If which of those is not specified,
+        will be assumed to 'arcsec'. If which of those is not specified,
         it will be set to the same value as the other. If none of them
         are specified, it will be determined from map extent and number
@@ -130 +130 @@
         """
         if not isinstance( cellx, str ):
-            cellx = '%sarcmin'%(cellx)
+            cellx = '%sarcsec'%(cellx)
         if not isinstance( celly, str ):
-            celly = '%sarcmin'%(celly)
+            celly = '%sarcsec'%(celly)
         self.gridder._defineimage( nx, ny, cellx, celly, center )
 
@@ -145 +145 @@
            'box': 1 pixel
            'sf': 3 pixels
-           'gauss': 3 pixels (width is used as HWHM)
+           'gauss': 1 pixel (width is used as HWHM)
 
         func -- Function type ('box', 'sf', 'gauss').
@@ -265 +265 @@
         idx = 0
         d0 = s.get_direction( 0 ).split()[-1]
-        while ( s.get_direction(self.npol*idx).split()[-1] == d0 ):  
+        while ( s.get_direction(self.npol*idx) is not None \
+                and s.get_direction(self.npol*idx).split()[-1] == d0 ):
             idx += 1
         
@@ -276 +277 @@
         #print self.blc
         #print self.trc
-        incrx = s.get_directionval( self.npol )
-        incry = s.get_directionval( self.nx*self.npol ) 
+        if nrow > 1:
+            incrx = s.get_directionval( self.npol )
+            incry = s.get_directionval( self.nx*self.npol )
+        else:
+            incrx = [0.0,0.0]
+            incry = [0.0,0.0]
         self.cellx = abs( self.blc[0] - incrx[0] )
         self.celly = abs( self.blc[1] - incry[1] )
@@ -287 +292 @@
         else:
             opt = 'pol %s'%(pol)
-        if chan < 0:
+        if type(chan) is list:
+            opt += ', averaged over channel %s-%s'%(chan[0],chan[1])
+        elif chan < 0:
             opt += ', averaged over channel'
         else:
             opt += ', channel %s'%(chan)
-        data = self.getData( chan, pol ) 
+        data = self.getData( chan, pol )
+        data = numpy.fliplr( data )
         title = 'Gridded Image (%s)'%(opt)
         pl.figure(10)
@@ -319 +327 @@
                     #print irow
         # show image
-        extent=[self.blc[0]-0.5*self.cellx,
-                self.trc[0]+0.5*self.cellx,
+        extent=[self.trc[0]+0.5*self.cellx,
+                self.blc[0]-0.5*self.cellx,
                 self.blc[1]-0.5*self.celly,
                 self.trc[1]+0.5*self.celly]
+        deccorr = 1.0/numpy.cos(0.5*(self.blc[1]+self.trc[1]))
         pl.imshow(data,extent=extent,origin='lower',interpolation='nearest')
         pl.colorbar()
         pl.xlabel('R.A. [rad]')
         pl.ylabel('Dec. [rad]')
+        ax = pl.axes()
+        ax.set_aspect(deccorr)
         pl.title( title )
 
@@ -359 +370 @@
 
     def getData( self, chan=-1, pol=-1 ):
-        if chan == -1:
+        if type(chan) == list:
+            spectra = self.__chanAverage(start=chan[0],end=chan[1])
+        elif chan == -1:
             spectra = self.__chanAverage()
         else:
@@ -370 +383 @@
         return retval
 
-    def __chanAverage( self ):
+    def __chanAverage( self, start=-1, end=-1 ):
         s = scantable( self.outfile, average=False )
         nrow = s.nrow() 
@@ -376 +389 @@
         irow = 0
         sp = [0 for i in xrange(self.nchan)]
+        if start < 0:
+            start = 0
+        if end < 0:
+            end = self.nchan
         for i in xrange(nrow/self.npol):
             for ip in xrange(self.npol):
-                sp = s._getspectrum( irow )
+                sp = s._getspectrum( irow )[start:end]
                 spectra[ip,i] = numpy.mean( sp )
                 irow += 1
+            
         return spectra