Changeset 2380

Timestamp:

12/21/11 16:30:13 (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...

Fixed a shape mismatch in row flag data which must have a shape (nrow)
while it was (npol,nrow).

File:

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

trunk/src/STGrid.cpp

@@ -196 +196 @@
   // data storage
   Int irow = -1 ;
-  IPosition mshape( 3, npol_, nchan_, nchunk_ ) ;
-  IPosition vshape( 2, npol_, nchunk_ ) ;
+  IPosition cshape( 3, npol_, nchan_, nchunk_ ) ;
+  IPosition mshape( 2, npol_, nchunk_ ) ;
+  IPosition vshape( 1, nchunk_ ) ;
   IPosition dshape( 2, 2, nchunk_ ) ;
-  Array<Complex> spectra( mshape ) ;
+  IPosition wshape( 2, nchan_, nchunk_ ) ;
+  Array<Complex> spectra( cshape ) ;
   Array<Double> direction( dshape ) ;
-  Array<Int> flagtra( mshape ) ;
+  Array<Int> flagtra( cshape ) ;
+  //Array<Int> rflag( mshape ) ;
   Array<Int> rflag( vshape ) ;
-  Array<Float> weight( vshape ) ;
+  Array<Float> weight( wshape ) ;
   Array<Double> xypos( dshape ) ;
 
@@ -237 +240 @@
   double eToPixel = 0.0 ;
   double eGGridSD = 0.0 ;
+
+  // prepare pointer
+  Float *conv_p = convFunc.getStorage( deleteConv ) ;
+  Complex *gdata_p = gdataArrC.getStorage( deleteDataG ) ;
+  Float *wdata_p = gwgtArr.getStorage( deleteWgtG ) ;
+  const Complex *data_p = spectra.getStorage( deleteData ) ;
+  const Float *wgt_p = weight.getStorage( deleteWgt ) ;
+  const Int *flag_p = flagtra.getStorage( deleteFlag ) ;
+  const Int *rflag_p = rflag.getStorage( deleteFlagR ) ;
+  Double *xypos_p = xypos.getStorage( deletePos ) ;
 
   while( !pastEnd() ) {
@@ -252 +265 @@
     eToPixel += t1-t0 ;
    
-    // prepare pointer
-    Float *conv_p = convFunc.getStorage( deleteConv ) ;
-    Complex *gdata_p = gdataArrC.getStorage( deleteDataG ) ;
-    Float *wdata_p = gwgtArr.getStorage( deleteWgtG ) ;
-    const Complex *data_p = spectra.getStorage( deleteData ) ;
-    const Float *wgt_p = weight.getStorage( deleteWgt ) ;
-    const Int *flag_p = flagtra.getStorage( deleteFlag ) ;
-    const Int *rflag_p = rflag.getStorage( deleteFlagR ) ;
-    Double *xypos_p = xypos.getStorage( deletePos ) ;
-
     // call ggridsd
     irow = -1 ;
@@ -290 +293 @@
     eGGridSD += t1-t0 ;
 
-    // finalization
-    convFunc.putStorage( conv_p, deleteConv ) ;
-    gdataArrC.putStorage( gdata_p, deleteDataG ) ;
-    gwgtArr.putStorage( wdata_p, deleteWgtG ) ;
-    xypos.putStorage( xypos_p, deletePos ) ;
-    spectra.freeStorage( data_p, deleteData ) ;
-    weight.freeStorage( wgt_p, deleteWgt ) ;
-    flagtra.freeStorage( flag_p, deleteFlag ) ;
-    rflag.freeStorage( rflag_p, deleteFlagR ) ;
   }
   os << "getDataChunk: elapsed time is " << eGetDataChunk << " sec." << LogIO::POST ; 
@@ -306 +300 @@
 
   // finalization
+  convFunc.putStorage( conv_p, deleteConv ) ;
+  gdataArrC.putStorage( gdata_p, deleteDataG ) ;
+  gwgtArr.putStorage( wdata_p, deleteWgtG ) ;
+  xypos.putStorage( xypos_p, deletePos ) ;
+  spectra.freeStorage( data_p, deleteData ) ;
+  weight.freeStorage( wgt_p, deleteWgt ) ;
+  flagtra.freeStorage( flag_p, deleteFlag ) ;
+  rflag.freeStorage( rflag_p, deleteFlagR ) ;
   delete polMap ;
   delete chanMap ;
@@ -702 +704 @@
   IPosition cshape( 3, npol_, nchan_, nrow_ ) ;
   IPosition mshape( 2, npol_, nrow_ ) ;
+  IPosition vshape( 1, nrow_ ) ;
   spectra.resize( cshape ) ;
   flagtra.resize( cshape ) ;
-  rflag.resize( mshape ) ;
+  rflag.resize( vshape ) ;
+  Vector<uInt> rflagPerPol( rflag ) ;
   direction.resize( IPosition(2,2,nrow_) ) ;
   Array<Float> tsys( cshape ) ;
@@ -710 +714 @@
 
   ArrayIterator<uChar> fli( flagtra, IPosition(2,1,2) ) ;
-  ArrayIterator<uInt> fri( rflag, IPosition(1,1) ) ;
   ArrayIterator<Float> tsi( tsys, IPosition(2,1,2) ) ;
   ArrayIterator<Double> tii( tint, IPosition(1,1) ) ;
@@ -722 +725 @@
   uInt len = nchan_ * nrow_ ;
   IPosition mshape2( 2, nchan_, nrow_ ) ;
-  IPosition vshape( 1, nrow_ ) ;
   Vector<Float> spSlice( nchan_ ) ;
   const Float *sps_p = spSlice.getStorage( bsps ) ;
@@ -746 +748 @@
     }
     Array<uChar> flSlice = fli.array() ;
-    Vector<uInt> frSlice = fri.array() ;
     flagtraCol.getColumn( flSlice ) ;
-    rflagCol.getColumn( frSlice ) ;
-    if ( ipol == 0 )
+    if ( ipol == 0 ) {
       directionCol.getColumn( direction ) ;
+      rflagCol.getColumn( rflagPerPol ) ;
+    }
+    else {
+      rflagPerPol += rflagCol.getColumn() ;
+    }
     Vector<Float> tmpF = tsysCol( 0 ) ;
     Array<Float> tsSlice = tsi.array() ;
@@ -765 +770 @@
 
     fli.next() ;
-    fri.next() ;
     tsi.next() ;
     tii.next() ;
@@ -777 +781 @@
 //   os << "direction=" << direction << LogIO::POST ;
 
+  weight.resize( IPosition(2,nchan_,nrow_) ) ;
   getWeight( weight, tsys, tint ) ;
 }
@@ -826 +831 @@
   Int nrow = min( spectra.shape()[2], nrow_-nprocessed_ ) ;
   Array<Float> tsys( spectra.shape() ) ;
-  Array<Double> tint( rflag.shape() ) ;
+  //Array<Double> tint( rflag.shape() ) ;
+  Array<Double> tint( IPosition(2,spectra.shape()[0],spectra.shape()[2]) ) ;
   IPosition m( 2, 0, 2 ) ;
   IPosition v( 1, 0 ) ;
@@ -832 +838 @@
   ArrayIterator<uChar> fli( flagtra, m, False ) ;
   ArrayIterator<Float> tsi( tsys, m, False ) ;
-  ArrayIterator<Double> di( direction, v ) ; 
+  ArrayIterator<Double> di( direction, v ) ;
   Bool bfr, bti ;
   uInt *fr_p = rflag.getStorage( bfr ) ;
@@ -855 +861 @@
       tsSlice = tmpF[0] ;
     }
-    *wfr_p = flagRowCol_( idx ) ;
     *wti_p = intervalCol_( idx ) ;
 
@@ -861 +866 @@
     fli.next() ;
     tsi.next() ;
-    wfr_p++ ;
     wti_p++ ;
   }
-  rflag.putStorage( fr_p, bfr ) ;
   tint.putStorage( ti_p, bti ) ;
 
@@ -871 +874 @@
     directionCol_.get( idx, di.array() ) ;
     di.next() ;
-  }
+
+    *wfr_p = flagRowCol_( idx ) ;
+    for ( Int ipol = 1 ; ipol < npol_ ; ipol++ ) {
+      *wfr_p = max( *wfr_p, flagRowCol_( rows_[offset+irow+ipol] ) ) ;
+    }
+    wfr_p++ ;
+  }
+  rflag.putStorage( fr_p, bfr ) ;
 
   getWeight( weight, tsys, tint ) ;
@@ -935 +945 @@
   Int nchan = refShape[1] ;
   Int nrow = refShape[2] ;
-  w.resize( IPosition(2,nchan,nrow) ) ;
 
   // set weight
-  Bool warn = False ;
   if ( wtype_.compare( "UNIFORM" ) == 0 ) {
     w = 1.0 ;
   }
   else if ( wtype_.compare( "TINT" ) == 0 ) {
-    if ( npol_ > 1 ) warn = True ;
     Bool b0, b1 ;
     Float *w_p = w.getStorage( b0 ) ;
@@ -960 +967 @@
   }
   else if ( wtype_.compare( "TSYS" ) == 0 ) {
-    if ( npol_ > 1 ) warn = True ;
     Bool b0, b1 ;
     Float *w_p = w.getStorage( b0 ) ;
@@ -977 +983 @@
   }
   else if ( wtype_.compare( "TINTSYS" ) == 0 ) {
-    if ( npol_ > 1 ) warn = True ;
     Bool b0, b1, b2 ;
     Float *w_p = w.getStorage( b0 ) ;