Changeset 34 for trunk

Timestamp:

07/07/04 18:37:16 (20 years ago)

Author:

mmarquar

Message:

Added frequency information handling.

Location:

trunk/src

Files:

• SDContainer.cc (modified) (6 diffs)
• SDContainer.h (modified) (2 diffs)

trunk/src/SDContainer.cc

@@ -65 +65 @@
     spectrum_(IPosition(4,nBeam,nIF,nPol,nChan)),
     flags_(IPosition(4,nBeam,nIF,nPol,nChan)),
-    tsys_(IPosition(4,nBeam,nIF,nPol,nChan)) {
+    tsys_(IPosition(4,nBeam,nIF,nPol,nChan)),
+    freqidx_(nIF) {
   uChar x = 0;
   flags_ = ~x;
@@ -77 +78 @@
     spectrum_(shp),
     flags_(shp),
-    tsys_(shp) {
+    tsys_(shp),
+    freqidx_(shp(1)){
   uChar x = 0;
   flags_ = ~x;
@@ -174 +176 @@
 }
 
-Array<Float> SDContainer::getSpectrum(uInt whichBeam, uInt whichIF) const
-{
+const Array<Float>& SDContainer::getSpectrum(uInt whichBeam, uInt whichIF) const {
   Matrix<Float> spectra(nChan_, nPol_);
 
@@ -209 +210 @@
 }
 
-Array<uChar> SDContainer::getFlags(uInt whichBeam, uInt whichIF) const
+const Array<uChar>& SDContainer::getFlags(uInt whichBeam, uInt whichIF) const
 {
   Matrix<uChar> flagtra(nChan_, nPol_);
@@ -244 +245 @@
 }
 
-Array<Float> SDContainer::getTsys(uInt whichBeam, uInt whichIF) const
+const Array<Float>& SDContainer::getTsys(uInt whichBeam, uInt whichIF) const
 {
   Vector<Float> tsys(nPol_);
@@ -269 +270 @@
     o0++;
   }
-
   return tsys;
 }
+
+Bool SDContainer::setFrequencyMap(uInt freqslot, uInt whichIF) {
+  freqidx_[whichIF] = freqslot;
+  return True;
+}
+
+Bool SDContainer::putFreqMap(const Vector<uInt>& freqs) {
+  freqidx_.resize();
+  freqidx_ = freqs;
+  return True;
+}
+
+Int SDFrequencyTable::addFrequency(Int refPix, Double refVal, Double inc) {
+  Int idx = -1;
+  Bool addit = False;
+  if (length() > 0) {
+    for (uInt i=0; i< length();++i) {
+      if ( refVal == refVal_[i] ) { // probably check with tolerance
+        if ( refPix == refPix_[i] )
+          if ( inc == increment_[i] )
+            idx = Int(i);
+      }
+    }
+    if (idx >= 0) {
+      return idx;
+    }
+  }
+  nFreq_ += 1;
+  refPix_.resize(nFreq_,True);
+  refVal_.resize(nFreq_,True);
+  increment_.resize(nFreq_,True);
+  refPix_[nFreq_-1] = refPix;
+  refVal_[nFreq_-1] = refVal;
+  increment_[nFreq_-1] = inc;
+  idx = nFreq_-1;
+  return idx;
+}
+

trunk/src/SDContainer.h

@@ -66 +66 @@
 public:
 
-  SDFrequencyTable() {;}
+  SDFrequencyTable() : nFreq_(0) {;}
+  virtual ~SDFrequencyTable() {;}
+  
+  Int length() const { return nFreq_;};// # of stored Frequencies
+
+  Double referencePixel(uInt which) const { return refPix_[which];}
+  Double referenceValue(uInt which) const { return refVal_[which];}
+  Double increment(uInt which) const { return increment_[which];}
+  Float equinox() const { return equinox_; }
+  String refFrame() const { return refFrame_; }
+
   // returns the index into the table
   // this creates a new one or returns an existing one
-  Int addFrequency(Double refPix, Double refVal, Double inc) {;}
-  
-  Int length() const { return nFreq_;};// # of stored Frequencies
-  // returns a Table with nRows == nFreq, and three cols
+  Int addFrequency(Int refPix, Double refVal, Double inc);
+  void setEquinox(Float eq) { equinox_ = eq; }
+  void setRefFrame(const String& reff) { refFrame_ = reff; }
   
 private:
   Int nFreq_;
-  std::vector<double> refPix_;
-  std::vector<double> revVal_;
-  std::vector<double> increment_;
+  Vector<Double> refPix_;
+  Vector<Double> refVal_;
+  Vector<Double> increment_;
+  Float equinox_;
+  String refFrame_;
 };
 
@@ -104 +115 @@
   Bool setPointing(const Vector<Double>& point, uInt whichBeam) {;}
 
-  Bool setFrequencyMap(uInt freqslot, uInt whichIF) {;}
+  Bool setFrequencyMap(uInt freqslot, uInt whichIF);
+  Bool putFreqMap(const Vector<uInt>& freqs);
   
+  const Array<Float>& getSpectrum(uInt whichBeam, uInt whichIF) const;
+  const Array<uChar>& getFlags(uInt whichBeam, uInt whichIF) const;
+  const Array<Float>& getTsys(uInt whichBeam, uInt whichIF) const;
+
   const Array<Float>& getSpectrum() const { return spectrum_; }
   const Array<uChar>& getFlags() const { return flags_; }
   const Array<Float>& getTsys() const { return tsys_; }
-  
-  Array<Float> getSpectrum(uInt whichBeam, uInt whichIF) const;
-  Array<uChar> getFlags(uInt whichBeam, uInt whichIF) const;
-  Array<Float> getTsys(uInt whichBeam, uInt whichIF) const;
+
+  const Vector<uInt>& getFreqMap() const { return freqidx_; }
 
   Double timestamp;