Changeset 2156 for trunk


Ignore:
Timestamp:
04/26/11 15:29:23 (14 years ago)
Author:
Takeshi Nakazato
Message:

New Development: No

JIRA Issue: Yes CAS-2819

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs:

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix on TIME value: changed from start time to mid point of integration.


Location:
trunk/external-alma/atnf/PKSIO
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/external-alma/atnf/PKSIO/NRODataset.cc

    r2031 r2156  
    602602}
    603603
     604double NRODataset::getScanTime( int i )
     605{
     606  double startTime = getStartIntTime( i ) ;
     607  double interval = getIPTIM() / 86400.0 ; // [sec]->[day]
     608  return startTime+0.5*interval ;
     609}
     610
    604611vector<bool> NRODataset::getIFs()
    605612{

  • trunk/external-alma/atnf/PKSIO/NRODataset.h

    r1868 r2156  
    194194  virtual vector<double> getStartIntTime() ;
    195195  virtual double getStartIntTime( int i ) ;
     196  virtual double getScanTime( int i ) ;
    196197  virtual double getMJD( char *time ) ;
    197198  virtual vector<bool> getIFs() ;

  • trunk/external-alma/atnf/PKSIO/NROFITSDataset.cc

    r1869 r2156  
    622622//   for ( int i = 0 ; i < ARYNM ; i++ ) {
    623623//     if ( i == 0 ) {
    624 //       //cout << "RX      " ;
     624//       cout << "RX      " ;
    625625//     }
    626626//     else if ( ( i % 5 ) == 0 ) {
    627 //       //cout << endl << "        " ;
    628 //     }
    629 //     //cout << "\'" << RX[i] << "\' " ;
     627//       cout << endl << "        " ;
     628//     }
     629//     cout << "\'" << RX[i] << "\' " ;
    630630//   }
    631 //   //cout << endl ;
     631//   cout << endl ;
    632632  //
    633633  if ( readColumn( HPBW, "HPBW", sameEndian ) != 0 ) {
    … …  
    27342734}
    27352735
     2736double NROFITSDataset::getScanTime( int i )
     2737{
     2738  double startTime = getStartIntTime( i ) ;
     2739  double interval ;
     2740  readTable( interval, "INTEG", same_, i ) ;
     2741  interval /= 86400.0 ;
     2742  return startTime+0.5*interval ;
     2743}
     2744
    27362745// double NROFITSDataset::toLSR( double v, double t, double x, double y )
    27372746// {

  • trunk/external-alma/atnf/PKSIO/NROFITSDataset.h

    r1868 r2156  
    9696  virtual uInt getArrayId( string type ) ;
    9797  virtual double getStartIntTime( int i ) ;
     98  virtual double getScanTime( int i ) ;
    9899
    99100 protected:

  • trunk/external-alma/atnf/PKSIO/NROReader.cc

    r2154 r2156  
    578578
    579579  // scantime
    580   scantime = Double( dataset_->getStartIntTime( irow ) ) ;
     580  //scantime = Double( dataset_->getStartIntTime( irow ) ) ;
     581  scantime = Double( dataset_->getScanTime( irow ) ) ;
    581582  //cout << "scantime = " << scantime << endl ;
    582583
Note: See TracChangeset for help on using the changeset viewer.