Changeset 1489 for branches


Ignore:
Timestamp:
01/22/09 19:25:52 (16 years ago)
Author:
Takeshi Nakazato
Message:

New Development: No

JIRA Issue: Yes CAS-1043

Ready to Release: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Modifications that are caused by changes of NROReader


File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/alma/src/STFiller.cpp

    r1482 r1489  
    552552
    553553  // DEBUG
     554  //cout << "STFiller::openNRO() Velocity Definition = " << nheader->getVDEF() << endl ;
     555
     556  // DEBUG
    554557  time_t t1 ;
    555558  time( &t1 ) ;
     
    569572int STFiller::readNRO()
    570573{
    571   //return 0 ;
    572 
    573574  // DEBUG
    574575  time_t t0 ;
     
    594595  int count = 0 ;
    595596  for ( i = 0 ; i < imax ; i++ ) {
    596     NRODataset *d = nreader_->getData( i ) ;
     597    if( nreader_->getData( i ) != 0 ) {
     598      cerr << "STFiller::readNRO()  error while reading row " << i << endl ;
     599      return -1 ;
     600    }
     601    NRODataset *d = nreader_->getData() ;
    597602
    598603    //char *scanType = d->getSCANTP() ;
     
    632637      RecordFieldPtr<Double> svelCol(rec, "SRCVELOCITY") ;
    633638      *svelCol = h->getURVEL() ;   // [m/s]
     639      //*svelCol = h->getURVEL() + d->VRAD ;  // [m/s]
    634640      RecordFieldPtr<Int> fitCol(rec, "FIT_ID") ;
    635641      *fitCol = -1 ;
     
    714720      count++ ;
    715721    }
     722    // DEBUG
     723    //int rownum = nreader_->getRowNum() ;
     724    //cout << "STFiller::readNRO() Finished row " << i << "/" << rownum << endl ;
     725    //
    716726  }
    717727
Note: See TracChangeset for help on using the changeset viewer.