Ignore:
Timestamp:
05/11/11 00:52:25 (14 years ago)
Author:
Takeshi Nakazato
Message:

Merge bug fix in trunk (r2164).

Location:
branches/casa-prerelease/pre-asap
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/casa-prerelease/pre-asap

    • Property svn:mergeinfo changed
      /trunkmerged: 2164
  • branches/casa-prerelease/pre-asap/src

  • branches/casa-prerelease/pre-asap/src/MSFiller.cpp

    r2160 r2165  
    13841384    return ;
    13851385  }
    1386   ROArrayColumn<Float> *tmpTcalCol = new ROArrayColumn<Float>( sctabsel, "TCAL" ) ;
     1386  ROArrayColumn<Float> *tmpTcalCol = new ROArrayColumn<Float>( sctabsel, colTcal_ ) ;
     1387  // return if any rows without Tcal value exists
     1388  Bool notDefined = False ;
     1389  for ( uInt irow = 0 ; irow < sctabsel.nrow() ; irow++ ) {
     1390    if ( !tmpTcalCol->isDefined( irow ) ) {
     1391      notDefined = True ;
     1392      break ;
     1393    }
     1394  }
     1395  if ( notDefined ) {
     1396    os_ << "No TCAL value" << LogIO::POST ;
     1397    delete tmpTcalCol ;
     1398    table_->tcal().table().addRow(1,True) ;
     1399    Vector<Float> defaultTcal( 1, 1.0 ) ;
     1400    ArrayColumn<Float> tcalCol( table_->tcal().table(), "TCAL" ) ;
     1401    tcalCol.put( 0, defaultTcal ) ;
     1402    return ;
     1403  }   
    13871404  uInt npol = tmpTcalCol->shape( 0 )(0) ;
    13881405  delete tmpTcalCol ;
  • branches/casa-prerelease/pre-asap/src/SConscript

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.