Changeset 1819 for trunk/src/STFrequencies.h

Timestamp:

08/02/10 17:28:20 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (merge alma branch to trunk)

Ready for Test: Yes

Interface Changes: No

Test Programs: regressions may work

Module(s): all single dish modules

Description:

Merged all changes in alma (r1386:1818) and newfiller (r1774:1818) branch.

Location:

trunk/src

Files:

• . (modified) (1 prop)
• STFrequencies.h (modified) (3 diffs)

trunk/src/STFrequencies.h

@@ -59 +59 @@
                  casa::Double& inc, casa::uInt id );
 
+  /***
+   * Set the frequency values for a specific id via references
+   * @param refpix the reference pixel
+   * @param refval the reference value
+   * @param inc    the increment
+   * @param id     the identifier
+   *
+   * 17/09/2008 Takeshi Nakazato
+   ***/
+  void setEntry( casa::Double refpix, casa::Double refval, 
+                 casa::Double inc, casa::uInt id ) ;
+
 
   bool conformant(const STFrequencies& other) const;
@@ -69 +81 @@
   casa::SpectralCoordinate getSpectralCoordinate( casa::uInt freqID ) const;
 
+  /**
   casa::SpectralCoordinate getSpectralCoordinate( const casa::MDirection& md,
                                                   const casa::MPosition& mp,
@@ -75 +88 @@
                                                   casa::uInt freqID
                                                   ) const;
+  **/
+  casa::SpectralCoordinate getSpectralCoordinate( const casa::MDirection& md,
+                                                  const casa::MPosition& mp,
+                                                  const casa::MEpoch& me,
+                                                  casa::Vector<casa::Double> restfreq,
+                                                  casa::uInt freqID
+                                                  ) const;
 
   /**