Changeset 2418

Timestamp:

03/01/12 01:30:42 (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 bug that causes seg fault when ifno is not explicitly given.

File:

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

trunk/src/STGrid.cpp

@@ -1159 +1159 @@
 {
   LogIO os( LogOrigin("STGrid","selectData",WHERE) ) ;    
-  Int ifno = ifno_ ;
+  //Int ifno = ifno_ ;
   tableList_.resize( nfile_ ) ;
-  if ( ifno == -1 ) {
+  if ( ifno_ == -1 ) {
     Table taborg( infileList_[0] ) ;
     ROScalarColumn<uInt> ifnoCol( taborg, "IFNO" ) ;
-    ifno = ifnoCol( 0 ) ;
+    ifno_ = ifnoCol( 0 ) ;
     os << LogIO::WARN
-       << "IFNO is not given. Using default IFNO: " << ifno << LogIO::POST ;
+       << "IFNO is not given. Using default IFNO: " << ifno_ << LogIO::POST ;
   }
   for ( uInt i = 0 ; i < nfile_ ; i++ ) {
@@ -1173 +1173 @@
     if ( isMultiIF( taborg ) ) {
       os << "apply selection on IFNO" << LogIO::POST ;
-      node = taborg.col("IFNO") == ifno ;
+      node = taborg.col("IFNO") == ifno_ ;
     }
     if ( scanlist_.size() > 0 ) {
@@ -1188 +1188 @@
     if ( tableList_[i].nrow() == 0 ) {
       os << LogIO::SEVERE
-         << "No corresponding rows for given selection: IFNO " << ifno ;
+         << "No corresponding rows for given selection: IFNO " << ifno_ ;
       if ( scanlist_.size() > 0 )
         os << " SCANNO " << scanlist_ ;