Changeset 2868 for trunk

Timestamp:

12/02/13 13:25:27 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: test_sdgrid

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Removed warning during compile.

File:

• trunk/src/STGrid.cpp (modified) (10 diffs)

trunk/src/STGrid.cpp

@@ -554 +554 @@
   const Int pol;
   STContext(STGrid *obj, STCommonData &common, Int pol)
-    : self(obj), common(common), pol(pol) {}
+    : common(common), self(obj), pol(pol) {}
 };
 
@@ -563 +563 @@
   const Int pol;
   STContextWithClipping(STGrid *obj, STCommonDataWithClipping &common, Int pol)
-    : self(obj), common(common), pol(pol) {}
+    : common(common), self(obj), pol(pol) {}
 };
 
@@ -1021 +1021 @@
   t0 = mathutil::gettimeofday_sec() ;
   uInt len = data_.nelements() ;
-  const Complex *w1_p ;
-  Float *w2_p ;
   Bool b1, b2, b3 ;
   const Complex *gdata_p = gdata.getStorage( b1 ) ;
-  Float *gwgt_p = data_.getStorage( b2 ) ;
+  Float *gwgt_p = gwgt.getStorage( b2 ) ; // storage shared with data_
   uChar *gflg_p = flag_.getStorage( b3 ) ;
   for ( uInt i = 0 ; i < len ; i++ ) {
@@ -1239 +1237 @@
 void STGrid::table( Table &tab, uInt i )
 {
-  if ( i >= 0 && i < nfile_ )
+  if ( i < nfile_ )
     tab = Table( infileList_[i] ) ;
 }
@@ -1308 +1306 @@
                          IPosition const &wshape,
                          IPosition const &vshape,
-                         IPosition const &dshape,
+                         IPosition const &/* dshape */,
                          Array<Complex> &spectra,
                          Array<Double> &direction,
@@ -1799 +1797 @@
     // determine pixel gwidth
     // default is HWHM corresponding to b = 1.0 (Mangum et al. 2007)
-    Double pixelGW;
+    Double pixelGW = -1.0;
     Quantum<Double> q ;
     if (!gwidth_.empty()) {
@@ -1817 +1815 @@
     // determine truncation radius
     // default is 3 * HWHM
-    Double truncate;
+    Double truncate = -1.0;
     if (!truncate_.empty()) {
       readQuantity( q, truncate_ );
@@ -1843 +1841 @@
     // determine pixel gwidth
     // default is HWHM corresponding to b = 2.52 (Mangum et al. 2007)
-    Double pixelGW;
+    Double pixelGW = -1.0;
     Quantum<Double> q ;
     if (!gwidth_.empty()) {
@@ -1861 +1859 @@
     // determine pixel c
     // default is c = 1.55 (Mangum et al. 2007)
-    Double pixelJW;
+    Double pixelJW = -1.0;
     if (!jwidth_.empty()) {
       readQuantity( q, jwidth_ );
@@ -1965 +1963 @@
 void STGrid::fillTable( Table &tab )
 {
-  IPosition dshape = data_.shape() ;
+  //IPosition dshape = data_.shape() ;
   Int nrow = nx_ * ny_ * npol_ ;
   tab.rwKeywordSet().define( "nPol", npol_ ) ;