Changeset 2678 for trunk/python

Timestamp:

10/23/12 13:59:36 (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...

Added new parameter to asapgrid.setFunc(). Also, default behavior
of STGrid is changed.

File:

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

trunk/python/asapgrid.py

@@ -135 +135 @@
         self.gridder._defineimage( nx, ny, cellx, celly, center )
 
-    def setFunc( self, func='box', width=-1, gwidth="", jwidth="" ):
+    def setFunc( self, func='box', convsupport=-1, truncate="-1", gwidth="-1", jwidth="-1" ):
         """
         Set convolution function. Possible options are 'box' (Box-car,
@@ -151 +151 @@
                  choose pre-defined value for each convolution function.
         """
-        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 )
+        self.gridder._setfunc(func,
+                              convsupport=convsupport,
+                              truncate=truncate,
+                              gwidth=gwidth,
+                              jwidth=jwidth)
+##         fname = func.upper()
+##         if fname == 'GAUSS' or fname == 'GJINC':
+##             gw = str(gwidth)
+##             jw = str(jwidth)
+##             w = str(width)
+##             #if len(w) > 0 and w[0] == '-':
+##             #    w = ''
+##             #self.gridder._setfunc(fname, -1, w, gw, jw)
+##             self.gridder._setfunc(fname,convsupport=-1,gwidth=gw,jwidth=jw,truncate=w)
+##         else:
+##             #if isinstance(width,str):
+##             #    w = -1
+##             #else:
+##             #    w = width
+##             self.gridder._setfunc( func, convsupport=width )
 
     def setWeight( self, weightType='uniform' ):