Changeset 1779 for branches/mergetest/src/STFrequencies.cpp

Timestamp:

07/29/10 19:13:46 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: No (test merging alma branch)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s):

Description:

Location:

branches/mergetest

Files:

• . (modified) (1 prop)
• src/STFrequencies.cpp (modified) (3 diffs)

branches/mergetest/src/STFrequencies.cpp

@@ -128 +128 @@
 }
 
+void STFrequencies::setEntry( Double refpix, Double refval, Double inc, uInt id )
+{
+  Table t = table_(table_.col("ID") == Int(id) );
+  if (t.nrow() == 0 ) {
+    throw(AipsError("STFrequencies::getEntry - freqID out of range"));
+  }
+  for ( uInt i = 0 ; i < table_.nrow() ; i++ ) {
+    uInt fid ;
+    idCol_.get( i, fid ) ;
+    if ( fid == id ) {
+      refpixCol_.put( i, refpix ) ;
+      refvalCol_.put( i, refval ) ;
+      incrCol_.put( i, inc ) ;
+    }
+  }
+}
+
 SpectralCoordinate STFrequencies::getSpectralCoordinate( uInt id ) const
 {
@@ -145 +162 @@
 }
 
+/**
 SpectralCoordinate
   STFrequencies::getSpectralCoordinate( const MDirection& md,
@@ -150 +168 @@
                                         const MEpoch& me,
                                         Double restfreq, uInt id ) const
+**/
+SpectralCoordinate
+  STFrequencies::getSpectralCoordinate( const MDirection& md,
+                                              const MPosition& mp,
+                                              const MEpoch& me,
+                                              Vector<Double> restfreq, uInt id ) const
 {
   SpectralCoordinate spc = getSpectralCoordinate(id);
-  spc.setRestFrequency(restfreq, True);
+  //spc.setRestFrequency(restfreq, True);
+  // for now just use the first rest frequency 
+  if (restfreq.nelements()==0 ) {
+    restfreq.resize(1);
+    restfreq[0] = 0;
+  }
+  spc.setRestFrequency(restfreq[0], True);
   if ( !spc.setReferenceConversion(getFrame(), me, mp, md) ) {
     throw(AipsError("Couldn't convert frequency frame."));