Changeset 2371 for trunk/src

Timestamp:

12/15/11 17:14:29 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2816

Ready for Test: No

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

Direct array data access in STGrid::getData and STGrid::saveData.
Modified duplicate table copy in STGrid::saveData.

Location:

trunk/src

Files:

• STGrid.cpp (modified) (10 diffs)
• STGrid.h (modified) (1 diff)

trunk/src/STGrid.cpp

@@ -21 +21 @@
 #include <measures/Measures/MDirection.h>
 
-#include <Scantable.h>
 #include <MathUtils.h>
 
@@ -305 +304 @@
   double t0, t1 ;
   t0 = mathutil::gettimeofday_sec() ;
-  data.resize( gdata.shape() ) ;  //data = 0.0 ;
+  data.resize( gdata.shape() ) ;
   uInt len = data.nelements() ;
   Float *w0_p ;
@@ -466 +465 @@
   Table tab ;
   selectData( tab ) ;
-  ROScalarColumn<uInt> polnoCol( tab, "POLNO" ) ;
-  Vector<uInt> pols = polnoCol.getColumn() ;
-  Vector<uInt> pollistOrg ;
-  uInt npolOrg = 0 ;
-  for ( uInt i = 0 ; i < pols.size() ; i++ ) {
-    if ( allNE( pollistOrg, pols[i] ) ) {
-      pollistOrg.resize( npolOrg+1, True ) ;
-      pollistOrg[npolOrg] = pols[i] ;
-      npolOrg++ ;
-    }
-  }
-  if ( pollist_.size() == 0 )
-    pollist_ = pollistOrg ;
-  else {
-    Vector<uInt> newlist ;
-    uInt newsize = 0 ;
-    for ( uInt i = 0 ; i < pollist_.size() ; i++ ) {
-      if ( anyEQ( pols, pollist_[i] ) ) {
-        newlist.resize( newsize+1, True ) ;
-        newlist[newsize] = pollist_[i] ;
-        newsize++ ;
-      }
-    }
-    pollist_ = newlist ;
-  }
-  npol_ = pollist_.size() ;
-  ROArrayColumn<uChar> tmpCol( tab, "FLAGTRA" ) ;
-  nchan_ = tmpCol( 0 ).nelements() ;
-  nrow_ = tab.nrow() / npolOrg ;
+  updatePolList( tab ) ;
 //   cout << "npol_ = " << npol_ << endl ;
 //   cout << "nchan_ = " << nchan_ << endl ;
@@ -503 +474 @@
   Cube<Float> tsys( npol_, nchan_, nrow_ ) ;
   Matrix<Double> tint( npol_, nrow_ ) ;
+  // boolean for pointer access
+  Bool bsp, bfl, bfr, bts, bti ;
+  // pointer to the data
+  Float *sp_p = spectra.getStorage( bsp ) ;
+  uChar *fl_p = flagtra.getStorage( bfl ) ;
+  uInt *fr_p = rflag.getStorage( bfr ) ;
+  Float *ts_p = tsys.getStorage( bts ) ;
+  Double *ti_p = tint.getStorage( bti ) ;
+  // working pointer
+  Float *wsp_p = sp_p ;
+  uChar *wfl_p = fl_p ;
+  uInt *wfr_p = fr_p ;
+  Float *wts_p = ts_p ;
+  Double *wti_p = ti_p ;
+  uInt len = nchan_ * nrow_ ;
+  IPosition mshape( 2, nchan_, nrow_ ) ;
+  IPosition vshape( 1, nrow_ ) ;
   for ( Int ipol = 0 ; ipol < npol_ ; ipol++ ) {
     Table subt = tab( tab.col("POLNO") == pollist_[ipol] ) ;
@@ -511 +499 @@
     ROArrayColumn<Float> tsysCol( subt, "TSYS" ) ;
     ROScalarColumn<Double> tintCol( subt, "INTERVAL" ) ;
-    Matrix<Float> tmpF = spectra.yzPlane( ipol ) ;
-    Matrix<uChar> tmpUC = flagtra.yzPlane( ipol ) ;
-    Vector<uInt> tmpUI = rflag.row( ipol ) ;
-    spectraCol.getColumn( tmpF ) ;
-    flagtraCol.getColumn( tmpUC ) ;
-    rflagCol.getColumn( tmpUI ) ;
+    Matrix<Float> spSlice( mshape, wsp_p, SHARE ) ; 
+    Matrix<uChar> flSlice( mshape, wfl_p, SHARE ) ;
+    Vector<uInt> frSlice( vshape, wfr_p, SHARE ) ;
+    spectraCol.getColumn( spSlice ) ;
+    flagtraCol.getColumn( flSlice ) ;
+    rflagCol.getColumn( frSlice ) ;
     if ( ipol == 0 )
       directionCol.getColumn( direction ) ;
-    Matrix<Float> tmpF2 = tsysCol.getColumn() ;
-    Vector<Double> tmpD = tint.row( ipol ) ;
-    if ( tmpF2.shape()(0) == nchan_ ) {
-      tsys.yzPlane( ipol ) = tmpF2 ;
+    Vector<Float> tmpF = tsysCol( 0 ) ;
+    Vector<Double> tmpD( vshape, wti_p, SHARE ) ;
+    Matrix<Float> tsSlice( mshape, wts_p, SHARE ) ;
+    if ( tmpF.nelements() == (uInt)nchan_ ) {
+      tsysCol.getColumn( tsSlice ) ;
     }
     else {
-      tsys.yzPlane( ipol ) = tmpF2(0,0) ;
+      tsSlice = tmpF( 0 ) ;
     }
     tintCol.getColumn( tmpD ) ;
-  }
+
+    wsp_p += len ;
+    wfl_p += len ;
+    wfr_p += nrow_ ;
+    wts_p += len ;
+    wti_p += nrow_ ;
+  }
+  spectra.putStorage( sp_p, bsp ) ;
+  flagtra.putStorage( fl_p, bfl ) ;
+  rflag.putStorage( fr_p, bfr ) ;
+  tsys.putStorage( ts_p, bts ) ;
+  tint.putStorage( ti_p, bti ) ;
 
   getWeight( weight, tsys, tint ) ;
+}
+
+void STGrid::updatePolList( Table &tab ) 
+{
+  ROScalarColumn<uInt> polnoCol( tab, "POLNO" ) ;
+  Vector<uInt> pols = polnoCol.getColumn() ;
+  Vector<uInt> pollistOrg ;
+  uInt npolOrg = 0 ;
+  uInt polno ;
+  for ( uInt i = 0 ; i < polnoCol.nrow() ; i++ ) {
+    //polno = polnoCol( i ) ; 
+    polno = pols( i ) ; 
+    if ( allNE( pollistOrg, polno ) ) {
+      pollistOrg.resize( npolOrg+1, True ) ;
+      pollistOrg[npolOrg] = polno ;
+      npolOrg++ ;
+    }
+  }
+  if ( pollist_.size() == 0 )
+    pollist_ = pollistOrg ;
+  else {
+    Vector<uInt> newlist ;
+    uInt newsize = 0 ;
+    for ( uInt i = 0 ; i < pollist_.size() ; i++ ) {
+      if ( anyEQ( pollistOrg, pollist_[i] ) ) {
+        newlist.resize( newsize+1, True ) ;
+        newlist[newsize] = pollist_[i] ;
+        newsize++ ;
+      }
+    }
+    pollist_.assign( newlist ) ;
+  }
+  npol_ = pollist_.size() ;
+  if ( npol_ == 0 ) {
+    LogIO os( LogOrigin("STGrid","updatePolList",WHERE) ) ;
+    os << LogIO::SEVERE << "Empty pollist" << LogIO::EXCEPTION ;
+  }
+  nrow_ = tab.nrow() / npolOrg ;
+  ROArrayColumn<uChar> tmpCol( tab, "FLAGTRA" ) ;
+  nchan_ = tmpCol( 0 ).nelements() ;
+//   LogIO os( LogOrigin("STGrid","updatePolList",WHERE) ) ;
+//   os << "npol_ = " << npol_ << "(" << pollist_ << ")" << endl 
+//      << "nchan_ = " << nchan_ << endl 
+//      << "nrow_ = " << nrow_ << LogIO::POST ;
 }
 
@@ -793 +837 @@
 
   //Int polno = 0 ;
-  string outfile_ ;
+  String outfile_ ;
   if ( outfile.size() == 0 ) {
     if ( infile_.lastchar() == '/' ) {
@@ -806 +850 @@
     outfile_ = outfile ;
   }
-  CountedPtr<Scantable> ref( new Scantable( infile_, Table::Plain ) ) ;
-  //cout << "ref->nchan()=" << ref->nchan() << endl ;
-  CountedPtr<Scantable> out( new Scantable( *ref, True ) ) ;
-  Table tab = out->table() ;
+  Table tab ;
+  prepareTable( tab, outfile_ ) ;
   IPosition dshape = data_.shape() ;
   Int nrow = nx_ * ny_ * npol_ ;
@@ -822 +864 @@
   ScalarColumn<uInt> polnoCol( tab, "POLNO" ) ;
   Int irow = 0 ;
+  Vector<Float> sp( nchan_ ) ;
+  Bool bsp, bdata ;
+  const Float *data_p = data_.getStorage( bdata ) ;
+  Float *wsp_p, *sp_p ;
+  const Float *wdata_p = data_p ;
+  long step = nx_ * ny_ * npol_ ;
+  long offset ;
   for ( Int iy = 0 ; iy < ny_ ; iy++ ) {
+    dir(1) = center_(1) - ( cpix(1) - (Double)iy ) * celly_ ;
     for ( Int ix = 0 ; ix < nx_ ; ix++ ) {
+      dir(0) = center_(0) - ( cpix(0) - (Double)ix ) * cellx_ ;
       for ( Int ipol = 0 ; ipol < npol_ ; ipol++ ) {
-        IPosition start( 4, ix, iy, ipol, 0 ) ;
-        IPosition end( 4, ix, iy, ipol, nchan_-1 ) ;
-        IPosition inc( 4, 1, 1, 1, 1 ) ;
-        Vector<Float> sp = data_( start, end, inc ) ;
-        dir(0) = center_(0) - ( cpix(0) - (Double)ix ) * cellx_ ;
-        dir(1) = center_(1) - ( cpix(1) - (Double)iy ) * celly_ ;
+        offset = ix + iy * nx_ + ipol * nx_ * ny_ ;
+        //os << "offset = " << offset << LogIO::POST ;
+        sp_p = sp.getStorage( bsp ) ;
+        wsp_p = sp_p ;
+        wdata_p = data_p + offset ;
+        for ( Int ichan = 0 ; ichan < nchan_ ; ichan++ ) {
+          *wsp_p = *wdata_p ;
+          wsp_p++ ;
+          wdata_p += step ;
+        }
+        sp.putStorage( sp_p, bsp ) ;
         spectraCol.put( irow, sp ) ;
         directionCol.put( irow, dir ) ;
@@ -838 +894 @@
     }
   }
-  //cout << "outfile_=" << outfile_ << endl ;
-  out->makePersistent( outfile_ ) ;
+  data_.freeStorage( data_p, bdata ) ;
 
   t1 = mathutil::gettimeofday_sec() ;
@@ -847 +902 @@
 }
 
-}
+void STGrid::prepareTable( Table &tab, String &name ) 
+{
+  Table t( infile_, Table::Old ) ;
+  t.deepCopy( name, Table::New, False, t.endianFormat(), True ) ;
+  tab = Table( name, Table::Update ) ;
+}
+}

trunk/src/STGrid.h

@@ -111 +111 @@
   Double polMean( const Double *p ) ;
 
+  void updatePolList( Table &tab ) ;
+
+  void prepareTable( Table &tab, String &name ) ;
+
   String infile_ ;
   Int ifno_ ;