Changeset 2389 for trunk

Timestamp:

12/27/11 15:46:11 (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...

Introduced infileList_ (Block<String>) instead of infile_ (String).

Location:

trunk/src

Files:

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

trunk/src/STGrid.cpp

@@ -79 +79 @@
 {
   String name( infile ) ;
-  if ( infile_.compare( name ) != 0 ) {
-    infile_ = String( infile ) ;
+  if ( infileList_.size() == 0 || infileList_[0].compare( name ) != 0 ) {
+    infileList_.resize( 1 ) ;
+    infileList_[0] = String(infile) ;
   }
 }
@@ -732 +733 @@
   LogIO os( LogOrigin("STGrid","selectData",WHERE) ) ;    
   Int ifno = ifno_ ;
-  Table taborg( infile_ ) ;
-  if ( ifno == -1 ) {
-    ROScalarColumn<uInt> ifnoCol( taborg, "IFNO" ) ;
-    ifno = ifnoCol( 0 ) ;
-    os << LogIO::WARN
+  uInt nfile = infileList_.size() ;
+  tableList_.resize( nfile ) ;
+  for ( uInt i = 0 ; i < nfile ; i++ ) {
+    Table taborg( infileList_[i] ) ;
+    if ( ifno == -1 ) {
+      ROScalarColumn<uInt> ifnoCol( taborg, "IFNO" ) ;
+      ifno = ifnoCol( 0 ) ;
+      os << LogIO::WARN
        << "IFNO is not given. Using default IFNO: " << ifno << LogIO::POST ;
-  }
-  TableExprNode node ;
-  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_ ) ;
-  }
-  if ( node.isNull() ) {
-    tab_ = taborg ;
-  }
-  else {
-    tab_ = taborg( node ) ;
-  }
-  if ( tab_.nrow() == 0 ) {
-    os << LogIO::SEVERE
-       << "No corresponding rows for given selection: IFNO " << ifno ;
-    if ( scanlist_.size() > 0 )
-      os << " SCANNO " << scanlist_ ;
-    os << LogIO::EXCEPTION ;
-  }
+    }
+    TableExprNode node ;
+    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_ ) ;
+    }
+    if ( node.isNull() ) {
+      tableList_[i] = taborg ;
+    }
+    else {
+      tableList_[i] = taborg( node ) ;
+    }
+    if ( tableList_[i].nrow() == 0 ) {
+      os << LogIO::SEVERE
+         << "No corresponding rows for given selection: IFNO " << ifno ;
+      if ( scanlist_.size() > 0 )
+        os << " SCANNO " << scanlist_ ;
+      os << LogIO::EXCEPTION ;
+    }
+  }
+  tab_ = tableList_[0] ;
 }
 
@@ -1211 +1217 @@
   String outfile_ ;
   if ( outfile.size() == 0 ) {
-    if ( infile_.lastchar() == '/' ) {
-      outfile_ = infile_.substr( 0, infile_.size()-1 ) ;
+    if ( infileList_[0].lastchar() == '/' ) {
+      outfile_ = infileList_[0].substr( 0, infileList_[0].size()-1 ) ;
     }
     else {
-      outfile_ = infile_ ;
+      outfile_ = infileList_[0] ;
     }
     outfile_ += ".grid" ;
@@ -1276 +1282 @@
 void STGrid::prepareTable( Table &tab, String &name ) 
 {
-  Table t( infile_, Table::Old ) ;
+  Table t( infileList_[0], Table::Old ) ;
   t.deepCopy( name, Table::New, False, t.endianFormat(), True ) ;
   tab = Table( name, Table::Update ) ;

trunk/src/STGrid.h

@@ -166 +166 @@
   String centerUI_ ;
 
-  String infile_ ;
+  Block<String> infileList_ ;
   Int ifno_ ;
   Int nx_ ;
@@ -187 +187 @@
 
   Table tab_ ;
+  Block<Table> tableList_ ;
   Table ptab_ ;
   ROArrayColumn<Float> spectraCol_ ;