Changeset 2376

Timestamp:

12/19/11 20:28:19 (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...

Sort table before process.

File:

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

trunk/src/STGrid.cpp

@@ -457 +457 @@
     node = node && taborg.col("SCANNO").in( scanlist_ ) ;
   }
-  tab = taborg( node ) ;
+  Block<String> cols( 3 ) ;
+  cols[0] = "TIME" ;
+  cols[1] = "BEAMNO" ;
+  cols[2] = "POLNO" ;
+  Block<Int> order( 3, Sort::Ascending ) ;
+  tab = taborg( node ).sort( cols, order ) ;
   if ( tab.nrow() == 0 ) {
     LogIO os( LogOrigin("STGrid","selectData",WHERE) ) ;
     os << LogIO::SEVERE
-       << "No corresponding rows for given selection: IFNO " << ifno 
-       << " SCANNO " << scanlist_ 
-       << LogIO::EXCEPTION ;
+       << "No corresponding rows for given selection: IFNO " << ifno ;
+    if ( scanlist_.size() > 0 )
+      os << " SCANNO " << scanlist_ ;
+    os << LogIO::EXCEPTION ;
   }
 }
@@ -583 +589 @@
 void STGrid::setupArray( Table &tab ) 
 {
+  LogIO os( LogOrigin("STGrid","setupArray",WHERE) ) ;
   ROScalarColumn<uInt> polnoCol( tab, "POLNO" ) ;
   Vector<uInt> pols = polnoCol.getColumn() ;
+  //os << pols << LogIO::POST ;
   Vector<uInt> pollistOrg ;
   uInt npolOrg = 0 ;
@@ -613 +621 @@
   npol_ = pollist_.size() ;
   if ( npol_ == 0 ) {
-    LogIO os( LogOrigin("STGrid","setupArray",WHERE) ) ;
     os << LogIO::SEVERE << "Empty pollist" << LogIO::EXCEPTION ;
   }
@@ -619 +626 @@
   ROArrayColumn<uChar> tmpCol( tab, "FLAGTRA" ) ;
   nchan_ = tmpCol( 0 ).nelements() ;
-//   LogIO os( LogOrigin("STGrid","setupArray",WHERE) ) ;
 //   os << "npol_ = " << npol_ << "(" << pollist_ << ")" << endl 
 //      << "nchan_ = " << nchan_ << endl