Changeset 2671 for trunk/python

Timestamp:

10/18/12 18:36:25 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4429

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

Implemented gauss and gjinc gridding. Added some arguments to
pass necessary parameters for those grid functions.

Also, defined helper function that plots current grid function
against radius in pixel.

File:

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

trunk/python/asapgrid.py

@@ -135 +135 @@
         self.gridder._defineimage( nx, ny, cellx, celly, center )
 
-    def setFunc( self, func='box', width=-1 ):
+    def setFunc( self, func='box', width=-1, gwidth="", jwidth="" ):
         """
         Set convolution function. Possible options are 'box' (Box-car,
@@ -151 +151 @@
                  choose pre-defined value for each convolution function.
         """
-        self.gridder._setfunc( func, width )
+        fname = func.upper()
+        if fname == 'GAUSS' or fname == 'GJINC':
+            gw = str(gwidth)
+            jw = str(jwidth)
+            w = str(width)
+            if w[0] == '-': w = ''
+            #self.gridder._setfunc(fname, -1, w, gw, jw)
+            self.gridder._setfunc(fname,convsupport=-1,gwidth=gw,jwidth=jw,truncate=w)
+        else:
+            self.gridder._setfunc( func, convsupport=width )
 
     def setWeight( self, weightType='uniform' ):
@@ -223 +232 @@
         asaplog.push('plot: elapsed time %s sec'%(t1-t0))
         asaplog.post('DEBUG','asapgrid.plot')
+
+    def plotFunc(self, clear=True):
+        """
+        Support function to see the shape of current grid function.
+
+        clear -- clear panel if True. Default is True.
+        """
+        pl.figure(11)
+        if clear:
+            pl.clf()
+        f = self.gridder._getfunc()
+        convsampling = 100
+        a = numpy.arange(0,len(f)/convsampling,1./convsampling,dtype=float)
+        pl.plot(a,f,'.-')
+        pl.xlabel('pixel')
+        pl.ylabel('convFunc')
         
 class asapgrid2:
@@ -367 +392 @@
                  choose pre-defined value for each convolution function.
         """
-        self.gridder._setfunc( func, width )
+        fname = func.upper()
+        if fname == 'GAUSS' or fname == 'GJINC':
+            gw = str(gwidth)
+            jw = str(jwidth)
+            w = str(width)
+            if w[0] == '-': w = ''
+            #self.gridder._setfunc(fname, -1, w, gw, jw)
+            self.gridder._setfunc(fname,convsupport=-1,gwidth=gw,jwidth=jw,truncate=w)
+        else:
+            self.gridder._setfunc( func, convsupport=width )
 
     def setWeight( self, weightType='uniform' ):
@@ -408 +442 @@
         tp = 0 if rcParams['scantable.storage']=='memory' else 1
         return scantable( self.gridder._get( tp ), average=False )
+    
+    def plotFunc(self, clear=True):
+        """
+        Support function to see the shape of current grid function.
+
+        clear -- clear panel if True. Default is True.
+        """
+        pl.figure(11)
+        if clear:
+            pl.clf()
+        f = self.gridder._getfunc()
+        convsampling = 100
+        a = numpy.arange(0,len(f)/convsampling,1./convsampling,dtype=float)
+        pl.plot(a,f,'.-')
+        pl.xlabel('pixel')
+        pl.ylabel('convFunc')
 
 class _SDGridPlotter: