Changeset 2678 for trunk

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.

Location:

trunk

Files:

• python/asapgrid.py (modified) (2 diffs)
• src/STGrid.cpp (modified) (7 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' ):

trunk/src/STGrid.cpp

@@ -469 +469 @@
   }
   else {
-    os << "      support = " << convSupport_ << endl;
+    os << "      support = " << userSupport_ << endl;
   }
   os << "   doclip = " << (doclip_?"True":"False") << endl ;
@@ -1789 +1789 @@
     // determine pixel gwidth
     // default is HWHM corresponding to b = 1.0 (Mangum et al. 2007)
-    Double pixelGW = sqrt(log(2.0)); 
+    Double pixelGW;
     Quantum<Double> q ;
     if (!gwidth_.empty()) {
@@ -1800 +1800 @@
       }
     }
+    pixelGW = (pixelGW >= 0.0) ? pixelGW : sqrt(log(2.0)); 
+    if (pixelGW < 0.0) {
+      os << LogIO::SEVERE
+         << "Negative width is specified for gaussian" << LogIO::EXCEPTION;
+    }
     // determine truncation radius
     // default is 3 * HWHM
-    Double truncate = 3.0 * pixelGW; 
+    Double truncate;
     if (!truncate_.empty()) {
       readQuantity( q, truncate_ );
@@ -1813 +1818 @@
     }      
     //convSupport_ = (Int)(truncate+0.5);
-    convSupport_ = (Int)(truncate);
+    truncate = (truncate >= 0.0) ? truncate : 3.0 * pixelGW;
+    convSupport_ = Int(truncate);
     convSupport_ += (((truncate-(Double)convSupport_) > 0.0) ? 1 : 0);
     Int convSize = convSampling_ * ( 2*convSupport_ + 2 ) ;
@@ -1827 +1833 @@
     // determine pixel gwidth
     // default is HWHM corresponding to b = 2.52 (Mangum et al. 2007)
-    Double pixelGW = sqrt(log(2.0)) * 2.52; 
+    Double pixelGW;
     Quantum<Double> q ;
     if (!gwidth_.empty()) {
@@ -1838 +1844 @@
       }
     }
+    pixelGW = (pixelGW >= 0.0) ? pixelGW : sqrt(log(2.0)) * 2.52; 
+    if (pixelGW < 0.0) {
+      os << LogIO::SEVERE
+         << "Negative width is specified for gaussian" << LogIO::EXCEPTION;
+    }
     // determine pixel c
     // default is c = 1.55 (Mangum et al. 2007)
-    Double pixelJW = 1.55;
+    Double pixelJW;
     if (!jwidth_.empty()) {
       readQuantity( q, jwidth_ );
@@ -1849 +1860 @@
         pixelJW = q.getValue("rad")/celly_;
       }
-    }      
+    }
+    pixelJW = (pixelJW >= 0.0) ? pixelJW : 1.55; 
+    if (pixelJW < 0.0) {
+      os << LogIO::SEVERE
+         << "Negative width is specified for jinc" << LogIO::EXCEPTION;
+    }
     // determine truncation radius
     // default is -1.0 (truncate at first null)