Changeset 2418 for trunk


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/STGrid.cpp

    r2414 r2418  
    11591159{
    11601160  LogIO os( LogOrigin("STGrid","selectData",WHERE) ) ;   
    1161   Int ifno = ifno_ ;
     1161  //Int ifno = ifno_ ;
    11621162  tableList_.resize( nfile_ ) ;
    1163   if ( ifno == -1 ) {
     1163  if ( ifno_ == -1 ) {
    11641164    Table taborg( infileList_[0] ) ;
    11651165    ROScalarColumn<uInt> ifnoCol( taborg, "IFNO" ) ;
    1166     ifno = ifnoCol( 0 ) ;
     1166    ifno_ = ifnoCol( 0 ) ;
    11671167    os << LogIO::WARN
    1168        << "IFNO is not given. Using default IFNO: " << ifno << LogIO::POST ;
     1168       << "IFNO is not given. Using default IFNO: " << ifno_ << LogIO::POST ;
    11691169  }
    11701170  for ( uInt i = 0 ; i < nfile_ ; i++ ) {
     
    11731173    if ( isMultiIF( taborg ) ) {
    11741174      os << "apply selection on IFNO" << LogIO::POST ;
    1175       node = taborg.col("IFNO") == ifno ;
     1175      node = taborg.col("IFNO") == ifno_ ;
    11761176    }
    11771177    if ( scanlist_.size() > 0 ) {
     
    11881188    if ( tableList_[i].nrow() == 0 ) {
    11891189      os << LogIO::SEVERE
    1190          << "No corresponding rows for given selection: IFNO " << ifno ;
     1190         << "No corresponding rows for given selection: IFNO " << ifno_ ;
    11911191      if ( scanlist_.size() > 0 )
    11921192        os << " SCANNO " << scanlist_ ;
Note: See TracChangeset for help on using the changeset viewer.