Changeset 1489 for branches

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:

• branches/alma/src/STFiller.cpp (modified) (5 diffs)

branches/alma/src/STFiller.cpp

@@ -552 +552 @@
 
   // DEBUG
+  //cout << "STFiller::openNRO() Velocity Definition = " << nheader->getVDEF() << endl ;
+
+  // DEBUG
   time_t t1 ;
   time( &t1 ) ;
@@ -569 +572 @@
 int STFiller::readNRO()
 {
-  //return 0 ;
-
   // DEBUG
   time_t t0 ;
@@ -594 +595 @@
   int count = 0 ;
   for ( i = 0 ; i < imax ; i++ ) {
-    NRODataset *d = nreader_->getData( i ) ;
+    if( nreader_->getData( i ) != 0 ) {
+      cerr << "STFiller::readNRO()  error while reading row " << i << endl ;
+      return -1 ;
+    }
+    NRODataset *d = nreader_->getData() ;
 
     //char *scanType = d->getSCANTP() ;
@@ -632 +637 @@
       RecordFieldPtr<Double> svelCol(rec, "SRCVELOCITY") ;
       *svelCol = h->getURVEL() ;   // [m/s]
+      //*svelCol = h->getURVEL() + d->VRAD ;  // [m/s]
       RecordFieldPtr<Int> fitCol(rec, "FIT_ID") ;
       *fitCol = -1 ;
@@ -714 +720 @@
       count++ ;
     }
+    // DEBUG
+    //int rownum = nreader_->getRowNum() ;
+    //cout << "STFiller::readNRO() Finished row " << i << "/" << rownum << endl ;
+    //
   }