Changeset 2746 for trunk


Ignore:
Timestamp:
01/23/13 19:09:27 (12 years ago)
Author:
Takeshi Nakazato
Message:

New Development: No

JIRA Issue: No

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 known bug that SYSCAL table is not properly handled when
import/export.


Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/MSFiller.cpp

    r2745 r2746  
    581581      tcalids = getTcalId( syscalTime[scIdx] ) ;
    582582    }
    583 //     else {
    584 //       tcalids = getDummyTcalId( spwId ) ;
    585 //     }
     583    else {
     584      tcalids = getDummyTcalId( spwId ) ;
     585    }
    586586
    587587    // put value
     
    12651265        idList[j] = tmp[0];
    12661266      }
    1267       cout << "tmp=" << tmp << endl;
    12681267    }
    12691268    return idList;
  • trunk/src/MSWriter.cpp

    r2743 r2746  
    16861686public:
    16871687  BaseTcalProcessor( ROArrayColumn<Float> &tcalCol )
    1688     : col( tcalCol )
     1688    : col_( tcalCol )
    16891689  {}
    16901690  virtual ~BaseTcalProcessor() {}
    1691   void setTcalId( Vector<uInt> &tcalId ) { id.assign( tcalId ) ; }
     1691  void setTcalId( Vector<uInt> &tcalId ) { id_.assign( tcalId ) ; }
    16921692  virtual Array<Float> getTcal() = 0 ;
    16931693protected:
    1694   ROArrayColumn<Float> col ;
    1695   Vector<uInt> id ;
     1694  ROArrayColumn<Float> col_ ;
     1695  Vector<uInt> id_ ;
    16961696};
    16971697
     
    17051705  virtual Array<Float> getTcal()
    17061706  {
    1707     uInt npol = id.nelements() ;
     1707    uInt npol = id_.nelements() ;
    17081708    Vector<Float> tcal( npol ) ;
    17091709    for ( uInt ipol = 0 ; ipol < npol ; ipol++ )
    1710       tcal[ipol] = col( id[ipol] ).data()[0] ;
     1710      tcal[ipol] = col_( id_[ipol] ).data()[0] ;
    17111711    //cout << "TcalProcessor: tcal = " << tcal << endl ;
    17121712    return tcal ;
     
    17231723  virtual Array<Float> getTcal()
    17241724  {
    1725     uInt npol = id.nelements() ;
    1726     Vector<Float> tcal0 = col( 0 ) ;
     1725    uInt npol = id_.nelements() ;
     1726    //Vector<Float> tcal0 = col_( 0 ) ;
     1727    Vector<Float> tcal0 = col_( id_[0] ) ;
    17271728    uInt nchan = tcal0.nelements() ;
    17281729    Matrix<Float> tcal( npol, nchan ) ;
    17291730    tcal.row( 0 ) = tcal0 ;
    17301731    for ( uInt ipol = 1 ; ipol < npol ; ipol++ )
    1731       tcal.row( ipol ) = col( id[ipol] ) ;
     1732      tcal.row( ipol ) = col_( id_[ipol] ) ;
    17321733    return tcal ;
    17331734  }
Note: See TracChangeset for help on using the changeset viewer.