Changeset 388

Timestamp:

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

Author:

kil064

Message:

add support for RestFreqID now beung a column in SDMemTable

Location:

trunk/src

Files:

• SDContainer.cc (modified) (7 diffs)
• SDContainer.h (modified) (5 diffs)

trunk/src/SDContainer.cc

@@ -79 +79 @@
     tsys_(IPosition(4,nBeam,nIF,nPol,nChan)),
     freqidx_(nIF),
+    restfreqidx_(nIF),
     direction_(IPosition(2,nBeam,2)) {
   uChar x = 0;
@@ -93 +94 @@
     flags_(shp),
     tsys_(shp),
-    freqidx_(shp(1)) {
+    freqidx_(shp(1)),
+    restfreqidx_(shp(1)) {
   IPosition ip(2,shp(0),2);
   direction_.resize(ip);
@@ -113 +115 @@
   tsys_.resize(shp);
   freqidx_.resize(shp(1));
+  restfreqidx_.resize(shp(1));
   IPosition ip(2,shp(0),2);
   direction_.resize(ip);
@@ -342 +345 @@
 
 
-Bool SDContainer::setFrequencyMap(uInt freqslot, uInt whichIF) {
-  freqidx_[whichIF] = freqslot;
+Bool SDContainer::setFrequencyMap(uInt freqID, uInt whichIF) {
+  freqidx_[whichIF] = freqID;
   return True;
 }
@@ -350 +353 @@
   freqidx_.resize();
   freqidx_ = freqs;
+  return True;
+}
+
+Bool SDContainer::setRestFrequencyMap(uInt freqID, uInt whichIF) {
+  restfreqidx_[whichIF] = freqID;
+  return True;
+}
+
+Bool SDContainer::putRestFreqMap(const Vector<uInt>& freqs) {
+  restfreqidx_.resize();
+  restfreqidx_ = freqs;
   return True;
 }
@@ -415 +429 @@
 
 
-
-// SDFrequenctTable
-
-
-Int SDFrequencyTable::addFrequency(Double refPix, Double refVal, Double inc) {
-  Int idx = -1;
-  Bool addit = False;
+uInt SDFrequencyTable::addFrequency(Double refPix, Double refVal, Double inc) 
+{
   if (length() > 0) {
-    for (uInt i=0; i< length();++i) {
-      if ( near(refVal,refVal_[i]) ) {
-        if (near(refPix,refPix_[i]) )
-          if ( near(inc,increment_[i]) )
-            idx = Int(i);
+    for (uInt i=0; i< length();i++) {
+      if (near(refVal,refVal_[i]) && 
+          near(refPix,refPix_[i]) && 
+          near(inc,increment_[i])) {
+         return i;
       }
     }
-    if (idx >= 0) {
-      return idx;
-    }
-  }
+  }
+
+// Not found - add it
+
   nFreq_ += 1;
   refPix_.resize(nFreq_,True);
@@ -441 +450 @@
   refVal_[nFreq_-1] = refVal;
   increment_[nFreq_-1] = inc;
-  idx = nFreq_-1;
-  return idx;
-}
-
-void SDFrequencyTable::addRestFrequency(Double val)
-{
-  if (restFreqs_.nelements()  == 0) {
-    restFreqs_.resize(1);
-    restFreqs_[0] = val;
-  } else {
-    Bool found = False;
-    for (uInt i=0;i<restFreqs_.nelements();++i) {
-      if (restFreqs_[i] == val) {
-        found = True;
-        return;
+  return nFreq_-1;
+}
+
+uInt SDFrequencyTable::addRestFrequency(Double val)
+{
+  uInt nFreq = restFreqs_.nelements();
+  if (nFreq>0) {
+    for (uInt i=0; i<nFreq;i++) {
+      if (near(restFreqs_[i],val)) {
+         return i;
       }
     }
-    if (!found) {
-      restFreqs_.resize(restFreqs_.nelements()+1,True);
-      restFreqs_[restFreqs_.nelements()-1] = val;
-    }
-  }
-}
+  }
+
+// Not found - add it
+
+  nFreq += 1;
+  restFreqs_.resize(nFreq,True);
+  restFreqs_[nFreq-1] = val;
+  return nFreq-1;
+}
+
+
 void SDFrequencyTable::restFrequencies(Vector<Double>& rfs, 
                                        String& rfunit ) const

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_;