Changeset 392

Timestamp:

02/08/05 15:48:11 (19 years ago)

Author:

kil064

Message:

merge SDMemTable::{selectRestFrequcy,setRestFrequencies} into one function,
setRestFrequencies

Location:

trunk/src

Files:

• SDContainer.h (modified) (3 diffs)
• SDMemTable.cc (modified) (4 diffs)
• SDMemTable.h (modified) (1 diff)
• SDMemTableWrapper.h (modified) (1 diff)
• python_SDMemTable.cc (modified) (1 diff)

trunk/src/SDContainer.h

@@ -78 +78 @@
 //  
   casa::Int length() const { return nFreq_;}          // # of stored Frequencies
-  void setLength(casa::Int length) {nFreq_ = length;}
+  void setLength(casa::uInt length) {nFreq_ = length;}
 
 // Get attributes
@@ -86 +86 @@
   casa::Float equinox() const { return equinox_; }
   casa::String refFrame() const { return refFrame_; }
+//
   void restFrequencies(casa::Vector<casa::Double>& rfs, 
                        casa::String& rfunit ) const ;
@@ -92 +93 @@
   void setEquinox(casa::Float eq) { equinox_ = eq; }
   void setRefFrame(const casa::String& reff) { refFrame_ = reff; }
+//
+  void deleteRestFrequencies () {restFreqs_.resize(0);}
   casa::uInt addRestFrequency(casa::Double);
   void setRestFrequencyUnit(const casa::String& theunit) {restFreqUnit_ = theunit;}

trunk/src/SDMemTable.cc

@@ -795 +795 @@
 }
 
-void SDMemTable::setRestFreqs(std::vector<double> freqs, 
-                              const std::string& theunit)
-{
-  Vector<Double> tvec(freqs);
-  Quantum<Vector<Double> > q(tvec, String(theunit));
-  tvec.resize();
-  tvec = q.getValue("Hz");
-  Table t = table_.keywordSet().asTable("FREQUENCIES");
-  t.rwKeywordSet().define("RESTFREQS",tvec);
-}
 
 std::vector<double> SDMemTable::getRestFreqs() const
@@ -1336 +1326 @@
 }
 
-casa::Bool SDMemTable::selectRestFreq (casa::Double restFreq, const String& unit,
-                                       const casa::String& source,
-                                       casa::Int whichIF)
+casa::Bool SDMemTable::setRestFreqs (const casa::Vector<Double>& restFreqs, const String& sUnit,
+                                     const casa::String& source,
+                                     casa::Int whichIF)
 {
    const Int nIFs = nIF();
@@ -1345 +1335 @@
    }
 
-// Find rest frequency.  Add it if necessary
-
+// If multiple restfreqs, must be length nIF. In this
+// case we will just replace the rest frequencies
+// 
+
+   const uInt nRestFreqs = restFreqs.nelements();
+   Unit unit(sUnit);
+   Int idx = -1;
    SDFrequencyTable sdft = getSDFreqTable();
-   Quantum<Double> rf(restFreq, Unit(unit));
-   uInt idx = sdft.addRestFrequency(rf.getValue("Hz"));
+
+   if (nRestFreqs>1) {
+
+// Replace restFreqs, one per IF
+
+      if (nRestFreqs != nIFs) {
+         throw (AipsError("Number of rest frequencies must be equal to the number of IFs"));
+      }
+//
+      sdft.deleteRestFrequencies();
+      for (uInt i=0; i<nRestFreqs; i++) {
+         Quantum<Double> rf(restFreqs[i], unit);
+         sdft.addRestFrequency(rf.getValue("Hz"));
+      }
+   } else {
+
+// Add new rest freq
+
+      Quantum<Double> rf(restFreqs[0], unit);
+      idx = sdft.addRestFrequency(rf.getValue("Hz"));
+   }
 
 // Replace
@@ -1362 +1376 @@
          srcnCol_.get(i, srcName);
          restfreqidCol_.get(i,restFreqIDs);       
-//
-         if (empty || source==srcName) {
-            if (whichIF<0) {
-               restFreqIDs = idx;
-            } else {              
-               restFreqIDs(whichIF) = idx;
+// 
+         if (idx==-1) {
+
+// Replace vector of restFreqs; one per IF. 
+// No selection possible
+
+            for (uInt i=0; i<nIFs; i++) restFreqIDs[i] = i;
+         } else {
+
+// Set RestFreqID for selected data
+
+            if (empty || source==srcName) {
+               if (whichIF<0) {
+                  restFreqIDs = idx;
+               } else {              
+                  restFreqIDs[whichIF] = idx;
+               }
             }
          }

trunk/src/SDMemTable.h

@@ -115 +115 @@
 
   virtual void setSpectrum(std::vector<float> spectrum, int whichRow=0);
-  virtual void setRestFreqs(std::vector<double> freqs, 
-                            const std::string& theunit);
   virtual void setCoordInfo(std::vector<string> theinfo);
 
-// Select RestFreqID.  FInds the restFreq ID for specified restFreq,
-// and updates RESTFREQID column of table for specified IF index
-// (-1 means all IFs) and source combination
-  virtual casa::Bool selectRestFreq (casa::Double restFreq, const casa::String& unit,
-                                     const casa::String& source,
-                                     casa::Int whichIF=-1);
+// Set RestFreqID.  source="" and IF=-1 means select all
+  virtual casa::Bool setRestFreqs (const casa::Vector<casa::Double>& restFreqs, 
+                                   const casa::String& unit,
+                                   const casa::String& source,
+                                   casa::Int whichIF=-1);
 
 // Get/Set flux unit

trunk/src/SDMemTableWrapper.h

@@ -145 +145 @@
   }
 
-  void setRestFreqs(std::vector<double> freqs, const std::string& theunit) {
-    table_->setRestFreqs(freqs, theunit);
-  }
-
-  bool selectRestFreq(double freq, const std::string& unit, 
-                      const std::string& source, int whichIF) {
-    return table_->selectRestFreq(casa::Double(freq), casa::String(unit),
-                                  casa::String(source),
-                                  casa::Int(whichIF));
+  bool setRestFreqs (const std::vector<double>& restfreqs, const std::string& unit, 
+                     const std::string& source, int whichIF) {
+    casa::Vector<casa::Double> restFreqs2(restfreqs);
+    return table_->setRestFreqs(restFreqs2, casa::String(unit),
+                                casa::String(source),
+                                casa::Int(whichIF));
   }
 

trunk/src/python_SDMemTable.cc

@@ -87 +87 @@
     .def("_save",  &SDMemTableWrapper::makePersistent)
     .def("_summary",  &SDMemTableWrapper::summary)
+    .def("_getrestfreqs",  &SDMemTableWrapper::getRestFreqs)
     .def("_setrestfreqs",  &SDMemTableWrapper::setRestFreqs)
-    .def("_getrestfreqs",  &SDMemTableWrapper::getRestFreqs)
-    .def("_selectrestfreq",  &SDMemTableWrapper::selectRestFreq)
     .def("_setcoordinfo", &SDMemTableWrapper::setCoordInfo)
     .def("_getcoordinfo", &SDMemTableWrapper::getCoordInfo)