Changeset 2386 for trunk

Timestamp:

12/22/11 19:48:03 (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...

Do data selection by TableExprNode only when it is really needed.

Location:

trunk/src

Files:

• STGrid.cpp (modified) (11 diffs)
• STGrid.h (modified) (2 diffs)

trunk/src/STGrid.cpp

@@ -279 +279 @@
   os << "   center = " << center_ << endl ;
   os << "   weighting = " << wtype_ << endl ;
-  os << "   convfunc = " << convType_ << "with support " << convSupport_ << endl ; 
+  os << "   convfunc = " << convType_ << " with support " << convSupport_ << endl ; 
   os << "----------" << LogIO::POST ;
   os << LogIO::NORMAL ;
@@ -354 +354 @@
     polMap[0] = ipol ;
 
-    os << "start pol" << ipol << LogIO::POST ;
+    os << "start pol " << ipol << LogIO::POST ;
 
     while( !pastEnd() ) {
@@ -412 +412 @@
 
     }
+
+    os << "end pol " << ipol << LogIO::POST ;
 
     nprocessed_ = 0 ;
@@ -552 +554 @@
 void STGrid::initPol( Int ipol ) 
 {
-  if ( npol_ == 1 )
+  LogIO os( LogOrigin("STGrid","initPol",WHERE) ) ;
+  if ( npolOrg_ == 1 ) {
+    os << "single polarization data." << LogIO::POST ;
     ptab_ = tab_ ;
+  }
   else 
     ptab_ = tab_( tab_.col("POLNO") == (uInt)ipol ) ;
@@ -707 +712 @@
 void STGrid::selectData()
 {
+  LogIO os( LogOrigin("STGrid","selectData",WHERE) ) ;    
   Int ifno = ifno_ ;
   Table taborg( infile_ ) ;
   if ( ifno == -1 ) {
-    LogIO os( LogOrigin("STGrid","selectData",WHERE) ) ;    
-//     os << LogIO::SEVERE
-//        << "Please set IFNO before actual gridding" 
-//        << LogIO::EXCEPTION ;
     ROScalarColumn<uInt> ifnoCol( taborg, "IFNO" ) ;
     ifno = ifnoCol( 0 ) ;
@@ -719 +721 @@
        << "IFNO is not given. Using default IFNO: " << ifno << LogIO::POST ;
   }
-//   tab = taborg( taborg.col("IFNO") == ifno ) ;
   TableExprNode node ;
-  node = taborg.col("IFNO") == ifno ;
+  if ( isMultiIF( taborg ) ) {
+    os << "apply selection on IFNO" << LogIO::POST ;
+    node = taborg.col("IFNO") == ifno ;
+  }
   if ( scanlist_.size() > 0 ) {
+    os << "apply selection on SCANNO" << LogIO::POST ;
     node = node && taborg.col("SCANNO").in( scanlist_ ) ;
   }
-  tab_ = taborg( node ) ;
+  if ( node.isNull() ) {
+    tab_ = taborg ;
+  }
+  else {
+    tab_ = taborg( node ) ;
+  }
   if ( tab_.nrow() == 0 ) {
-    LogIO os( LogOrigin("STGrid","selectData",WHERE) ) ;
     os << LogIO::SEVERE
        << "No corresponding rows for given selection: IFNO " << ifno ;
@@ -734 +743 @@
     os << LogIO::EXCEPTION ;
   }
-  //attach( tab_ ) ;
+}
+
+Bool STGrid::isMultiIF( Table &tab ) 
+{
+  ROScalarColumn<uInt> ifnoCol( tab, "IFNO" ) ;
+  Vector<uInt> ifnos = ifnoCol.getColumn() ;
+  return anyNE( ifnos, ifnos[0] ) ;
 }
 
@@ -874 +889 @@
 
   RefRows rows( nprocessed_, nprocessed_+nrow-1, 1 ) ;
-  os<<LogIO::DEBUGGING<<"nprocessed_="<<nprocessed_<<": 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 ) ;
@@ -904 +919 @@
   //os << pols << LogIO::POST ;
   Vector<uInt> pollistOrg ;
-  uInt npolOrg = 0 ;
+  npolOrg_ = 0 ;
   uInt polno ;
   for ( uInt i = 0 ; i < polnoCol.nrow() ; i++ ) {
@@ -910 +925 @@
     polno = pols( i ) ; 
     if ( allNE( pollistOrg, polno ) ) {
-      pollistOrg.resize( npolOrg+1, True ) ;
-      pollistOrg[npolOrg] = polno ;
-      npolOrg++ ;
+      pollistOrg.resize( npolOrg_+1, True ) ;
+      pollistOrg[npolOrg_] = polno ;
+      npolOrg_++ ;
     }
   }
@@ -933 +948 @@
     os << LogIO::SEVERE << "Empty pollist" << LogIO::EXCEPTION ;
   }
-  nrow_ = tab_.nrow() / npolOrg ;
+  nrow_ = tab_.nrow() / npolOrg_ ;
   ROArrayColumn<uChar> tmpCol( tab_, "FLAGTRA" ) ;
   nchan_ = tmpCol( 0 ).nelements() ;

trunk/src/STGrid.h

@@ -153 +153 @@
 
   void initPol( Int ipol ) ;
+  Bool isMultiIF( Table &tab ) ;
 
 
@@ -160 +161 @@
   Int ny_ ;
   Int npol_ ;
+  Int npolOrg_ ;
   Int nchan_ ;
   Int nrow_ ;