Changeset 2385 for trunk/src

Timestamp:

12/22/11 19:05:30 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2816

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

Bug fix on call_ggridsd

File:

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

trunk/src/STGrid.cpp

@@ -197 +197 @@
   Float *wgrid_p = gwgt.getStorage( deleteWgtG ) ;
   Float *conv_p = convFunc.getStorage( deleteConv ) ;
+
+  // pass copy of irow to ggridsd since it will be modified in theroutine
+  Int irowCopy = irow ;
       
   // call ggridsd
@@ -208 +211 @@
            wgt_p,
            &nrow,
-           &irow,
+           &irowCopy,
            grid_p,
            wgrid_p,
@@ -244 +247 @@
 {
   LogIO os( LogOrigin("STGrid", "grid", WHERE) ) ;
+  double t0,t1 ;
 
   // data selection
+  t0 = mathutil::gettimeofday_sec() ;
   selectData() ;
+  t1 = mathutil::gettimeofday_sec() ;
+  os << "selectData: elapsed time is " << t1-t0 << " sec." << LogIO::POST ;
+
   setupArray() ;
 
@@ -287 +295 @@
   // TODO: nchunk_ must be determined from nchan_, npol_, and (nx_,ny_) 
   //       by considering data size to be allocated for ggridsd input/output
-  nchunk_ = 100 ;
+  nchunk_ = 400 ;
   Bool b = nchunk_ >= nrow_ ;
   nchunk_ = min( nchunk_, nrow_ ) ;
@@ -369 +377 @@
       t0 = mathutil::gettimeofday_sec() ;
       Int nrow = getDataChunk( spectra, direction, flagtra, rflag, weight ) ;
-      //os << "nrow = " << nrow << LogIO::POST ;
       t1 = mathutil::gettimeofday_sec() ;
       eGetData += t1-t0 ;
@@ -498 +505 @@
     toPixel( direction, xypos ) ;  
     t1 = mathutil::gettimeofday_sec() ;
-    //os << "xypos=" << xypos << LogIO::POST ;
-    os << "toPixel: elapsed time is " << t1-t0 << " sec." << LogIO::POST ; 
+    eToPixel += t1-t0 ;
     
     // call ggridsd
@@ -546 +552 @@
 void STGrid::initPol( Int ipol ) 
 {
-  ptab_ = tab_( tab_.col("POLNO") == (uInt)ipol ) ;
+  if ( npol_ == 1 )
+    ptab_ = tab_ ;
+  else 
+    ptab_ = tab_( tab_.col("POLNO") == (uInt)ipol ) ;
 
   attach( ptab_ ) ;
@@ -701 +710 @@
   Table taborg( infile_ ) ;
   if ( ifno == -1 ) {
-    LogIO os( LogOrigin("STGrid","selectData",WHERE) ) ;
+    LogIO os( LogOrigin("STGrid","selectData",WHERE) ) ;    
 //     os << LogIO::SEVERE
 //        << "Please set IFNO before actual gridding" 
@@ -819 +828 @@
                           Array<Float> &weight ) 
 {
+  LogIO os( LogOrigin("STGrid","getDataChunk",WHERE) ) ;
   Int nrow = getDataChunk( spectraF_, direction, flagtraUC_, rflagUI_, weight ) ;
   if ( nrow < nchunk_ ) {
@@ -864 +874 @@
 
   RefRows rows( nprocessed_, nprocessed_+nrow-1, 1 ) ;
-  os << "rows.nrows()=" << rows.nrows() << LogIO::POST ;
+  os<<LogIO::DEBUGGING<<"nprocessed_="<<nprocessed_<<": rows.nrows()="<<rows.nrows()<<LogIO::POST ;
   spectraCol_.getColumnCells( rows, spectra ) ;
   flagtraCol_.getColumnCells( rows, flagtra ) ;
@@ -875 +885 @@
   else
     tsys = tsysTemp[0] ;
-  
+
   double t0,t1 ;
   t0 = mathutil::gettimeofday_sec() ;