Changeset 388 for trunk/src/SDContainer.h

Timestamp:

02/08/05 14:05:32 (19 years ago)

Author:

kil064

Message:

add support for RestFreqID now beung a column in SDMemTable

File:

• trunk/src/SDContainer.h (modified) (5 diffs)

trunk/src/SDContainer.h

@@ -74 +74 @@
 
 // Add a new entry or match an existing one. Returns the index into the table
-  casa::Int addFrequency(casa::Double refPix, casa::Double refVal, 
+  casa::uInt addFrequency(casa::Double refPix, casa::Double refVal, 
                          casa::Double inc);
 //  
@@ -92 +92 @@
   void setEquinox(casa::Float eq) { equinox_ = eq; }
   void setRefFrame(const casa::String& reff) { refFrame_ = reff; }
-  void addRestFrequency(casa::Double);
+  casa::uInt addRestFrequency(casa::Double);
   void setRestFrequencyUnit(const casa::String& theunit) {restFreqUnit_ = theunit;}
 
 private:
-  casa::Int nFreq_;
+  casa::uInt nFreq_;
   casa::Vector<casa::Double> refPix_;
   casa::Vector<casa::Double> refVal_;           // Hz
@@ -136 +136 @@
   casa::Bool setFrequencyMap(casa::uInt freqslot, casa::uInt whichIF);
   casa::Bool putFreqMap(const casa::Vector<casa::uInt>& freqs);
+
+  casa::Bool setRestFrequencyMap(casa::uInt freqslot, casa::uInt whichIF);
+  casa::Bool putRestFreqMap(const casa::Vector<casa::uInt>& freqs);
   
   casa::Array<casa::Float> getSpectrum(casa::uInt whichBeam, 
@@ -151 +154 @@
 
   const casa::Vector<casa::uInt>& getFreqMap() const { return freqidx_; }
+  const casa::Vector<casa::uInt>& getRestFreqMap() const { return restfreqidx_; }
   
   const casa::Vector<casa::String>& getHistory() const { return history_; }
@@ -183 +187 @@
   //(nIF) indx into "global" frequency table
   casa::Vector<casa::uInt>    freqidx_;
+ // (nIF) indx into "global" rest frequency table
+  casa::Vector<casa::uInt>    restfreqidx_;
   //(nBeam,2) maybe use Measures here...
   casa::Array<casa::Double>   direction_;