Changeset 1490 for branches/alma

Timestamp:

01/23/09 18:06:33 (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: Yes/No

Module(s): Module Names change impacts.

Description: Changed criteria if new row is added to the

FREQUENCIES subtable or not.

File:

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

branches/alma/src/STFiller.cpp

@@ -456 +456 @@
        << ")" << endl ;
   //
-  if ( nreader_->open() != 0 ) {
-    throw( AipsError( "Error while opening file "+filename_ ) ) ;
-  }
+//   if ( nreader_->open() != 0 ) {
+//     throw( AipsError( "Error while opening file "+filename_ ) ) ;
+//   }
 
   isNRO_ = true ;
@@ -591 +591 @@
   uInt id ;
   uInt imax = nreader_->getRowNum() ;
+  vector< vector<double > > freqs ;
   //uInt imax = 30 ;
   uInt i = 0 ;
@@ -636 +637 @@
       *sdirCol = nreader_->getSourceDirection() ;
       RecordFieldPtr<Double> svelCol(rec, "SRCVELOCITY") ;
-      *svelCol = h->getURVEL() ;   // [m/s]
-      //*svelCol = h->getURVEL() + d->VRAD ;  // [m/s]
+      //*svelCol = h->getURVEL() ;   // [m/s]
+      *svelCol = h->getURVEL() + d->VRAD ;  // [m/s]
       RecordFieldPtr<Int> fitCol(rec, "FIT_ID") ;
       *fitCol = -1 ;
@@ -662 +663 @@
       RecordFieldPtr<uInt> mfreqidCol(rec, "FREQ_ID") ;
       vector<double> fqs = nreader_->getFrequencies( i ) ;
-      id = table_->frequencies().addEntry( Double( fqs[0] ),
-                                           Double( fqs[1] ),
-                                           Double( fqs[2] ) ) ;
-      *mfreqidCol = id ;
-      *ifCol = id ;
+      //cout << "STFiller::readNRO()  fqs[1] = " << fqs[1] << endl ;
+      if ( freqs.size() == 0 ) {
+        id = table_->frequencies().addEntry( Double( fqs[0] ),
+                                             Double( fqs[1] ),
+                                             Double( fqs[2] ) ) ;
+        *mfreqidCol = id ;
+        *ifCol = id ;
+        freqs.push_back( fqs ) ;
+      }
+      else {
+        int iadd = -1 ;
+        for ( uInt iif = 0 ; iif < freqs.size() ; iif++ ) {
+          //cout << "STFiller::readNRO()  freqs[" << iif << "][1] = " << freqs[iif][1] << endl ;
+          double fdiff = abs( freqs[iif][1] - fqs[1] ) / freqs[iif][1] ;
+          //cout << "STFiller::readNRO()  fdiff = " << fdiff << endl ;
+          if ( fdiff < 1.0e-8 ) {
+            iadd = iif ;
+            break ;
+          }
+        }
+        if ( iadd == -1 ) {
+          id = table_->frequencies().addEntry( Double( fqs[0] ),
+                                               Double( fqs[1] ),
+                                               Double( fqs[2] ) ) ;
+          *mfreqidCol = id ;
+          *ifCol = id ;
+          freqs.push_back( fqs ) ;
+        }
+        else {
+          *mfreqidCol = iadd ;
+          *ifCol = iadd ;
+        }
+      }
       RecordFieldPtr<uInt> molidCol(rec, "MOLECULE_ID") ;
       Vector<Double> restfreq( IPosition( 1, 1 ) ) ;