Changeset 204

Timestamp:

01/18/05 17:22:47 (19 years ago)

Author:

mar637

Message:

• added fluxunit, epoch
• added restfrequencies
• added history
• now using asap::AxisNo? enum instead of fixed axis indeces

Location:

trunk/src

Files:

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

trunk/src/SDContainer.cc

@@ -37 +37 @@
 #include <casa/Quanta/MVTime.h>
 
+#include "Definitions.h"
 #include "SDContainer.h"
 
@@ -121 +122 @@
                               uInt whichBeam, uInt whichIF) {
 
-  ArrayAccessor<Float, Axis<0> > aa0(spectrum_);
+  ArrayAccessor<Float, Axis<asap::BeamAxis> > aa0(spectrum_);
   aa0.reset(aa0.begin(whichBeam));
-  ArrayAccessor<Float, Axis<1> > aa1(aa0);
+  ArrayAccessor<Float, Axis<asap::IFAxis> > aa1(aa0);
   aa1.reset(aa1.begin(whichIF));
   
   //Vector<Float> pols(nPol);
-  ArrayAccessor<Float, Axis<1> > j(spec);
+  ArrayAccessor<Float, Axis<asap::IFAxis> > j(spec);
   IPosition shp0 = spectrum_.shape();
   IPosition shp1 = spec.shape();
@@ -135 +136 @@
   }
   // assert dimensions are the same....
-  for (ArrayAccessor<Float, Axis<2> > i(aa1);i != i.end(); ++i) {
-    ArrayAccessor<Float, Axis<0> > jj(j);
-    for (ArrayAccessor<Float, Axis<3> > ii(i);ii != ii.end(); ++ii) {
+  for (ArrayAccessor<Float, Axis<asap::PolAxis> > i(aa1);i != i.end(); ++i) {
+    ArrayAccessor<Float, Axis<asap::BeamAxis> > jj(j);
+    for (ArrayAccessor<Float, Axis<asap::ChanAxis> > ii(i);ii != ii.end(); ++ii) {
       (*ii) = (*jj);
       jj++;
@@ -156 +157 @@
                            uInt whichBeam, uInt whichIF) {
 
-  ArrayAccessor<uChar, Axis<0> > aa0(flags_);
+  ArrayAccessor<uChar, Axis<asap::BeamAxis> > aa0(flags_);
   aa0.reset(aa0.begin(whichBeam));
-  ArrayAccessor<uChar, Axis<1> > aa1(aa0);
+  ArrayAccessor<uChar, Axis<asap::IFAxis> > aa1(aa0);
   aa1.reset(aa1.begin(whichIF));
   
-  ArrayAccessor<uChar, Axis<1> > j(flag);
+  ArrayAccessor<uChar, Axis<asap::IFAxis> > j(flag);
   IPosition shp0 = flags_.shape();
   IPosition shp1 = flag.shape();
@@ -170 +171 @@
 
   // assert dimensions are the same....
-  for (ArrayAccessor<uChar, Axis<2> > i(aa1);i != i.end(); ++i) {
-    ArrayAccessor<uChar, Axis<0> > jj(j);
-    for (ArrayAccessor<uChar, Axis<3> > ii(i);ii != ii.end(); ++ii) {
+  for (ArrayAccessor<uChar, Axis<asap::PolAxis> > i(aa1);i != i.end(); ++i) {
+    ArrayAccessor<uChar, Axis<asap::BeamAxis> > jj(j);
+    for (ArrayAccessor<uChar, Axis<asap::ChanAxis> > ii(i);ii != ii.end(); ++ii) {
       (*ii) = (*jj);
       jj++;
@@ -183 +184 @@
 Bool SDContainer::setTsys(const Vector<Float>& tsys,
                           uInt whichBeam, uInt whichIF) {
-  ArrayAccessor<Float, Axis<0> > aa0(tsys_);
+  ArrayAccessor<Float, Axis<asap::BeamAxis> > aa0(tsys_);
   aa0.reset(aa0.begin(whichBeam));
-  ArrayAccessor<Float, Axis<1> > aa1(aa0);
+  ArrayAccessor<Float, Axis<asap::IFAxis> > aa1(aa0);
   aa1.reset(aa1.begin(whichIF));
   // assert dimensions are the same....
-  for (ArrayAccessor<Float, Axis<3> > i(aa1);i != i.end(); ++i) {    
-    ArrayAccessor<Float, Axis<0> > j(tsys);
-    for (ArrayAccessor<Float, Axis<2> > ii(i);ii != ii.end(); ++ii) {
+  for (ArrayAccessor<Float, Axis<asap::ChanAxis> > i(aa1);i != i.end(); ++i) {    
+    ArrayAccessor<Float, Axis<asap::BeamAxis> > j(tsys);
+    for (ArrayAccessor<Float, Axis<asap::PolAxis> > ii(i);ii != ii.end(); ++ii) {
       (*ii) = (*j);
       j++;
@@ -202 +203 @@
 
   // Beam.
-  ArrayAccessor<Float, Axis<0> > i0(spectrum_);
+  ArrayAccessor<Float, Axis<asap::BeamAxis> > i0(spectrum_);
   i0.reset(i0.begin(whichBeam));
 
   // IF.
-  ArrayAccessor<Float, Axis<1> > i1(i0);
+  ArrayAccessor<Float, Axis<asap::IFAxis> > i1(i0);
   i1.reset(i1.begin(whichIF));
 
   // Polarization.
-  ArrayAccessor<Float, Axis<2> > i2(i1);
-  ArrayAccessor<Float, Axis<1> > o1(spectra);
+  ArrayAccessor<Float, Axis<asap::PolAxis> > i2(i1);
+  ArrayAccessor<Float, Axis<asap::IFAxis> > o1(spectra);
 
   while (i2 != i2.end()) {
     // Channel.
-    ArrayAccessor<Float, Axis<3> > i3(i2);
-    ArrayAccessor<Float, Axis<0> > o0(o1);
+    ArrayAccessor<Float, Axis<asap::ChanAxis> > i3(i2);
+    ArrayAccessor<Float, Axis<asap::BeamAxis> > o0(o1);
 
     while (i3 != i3.end()) {
@@ -238 +239 @@
 
   // Beam.
-  ArrayAccessor<uChar, Axis<0> > i0(flags_);
+  ArrayAccessor<uChar, Axis<asap::BeamAxis> > i0(flags_);
   i0.reset(i0.begin(whichBeam));
 
   // IF.
-  ArrayAccessor<uChar, Axis<1> > i1(i0);
+  ArrayAccessor<uChar, Axis<asap::IFAxis> > i1(i0);
   i1.reset(i1.begin(whichIF));
 
   // Polarization.
-  ArrayAccessor<uChar, Axis<2> > i2(i1);
-  ArrayAccessor<uChar, Axis<1> > o1(flagtra);
+  ArrayAccessor<uChar, Axis<asap::PolAxis> > i2(i1);
+  ArrayAccessor<uChar, Axis<asap::IFAxis> > o1(flagtra);
 
   while (i2 != i2.end()) {
     // Channel.
-    ArrayAccessor<uChar, Axis<3> > i3(i2);
-    ArrayAccessor<uChar, Axis<0> > o0(o1);
+    ArrayAccessor<uChar, Axis<asap::ChanAxis> > i3(i2);
+    ArrayAccessor<uChar, Axis<asap::BeamAxis> > o0(o1);
 
     while (i3 != i3.end()) {
@@ -273 +274 @@
 
   // Beam.
-  ArrayAccessor<Float, Axis<0> > i0(tsys_);
+  ArrayAccessor<Float, Axis<asap::BeamAxis> > i0(tsys_);
   i0.reset(i0.begin(whichBeam));
 
   // IF.
-  ArrayAccessor<Float, Axis<1> > i1(i0);
+  ArrayAccessor<Float, Axis<asap::IFAxis> > i1(i0);
   i1.reset(i1.begin(whichIF));
 
   // Channel.
-  ArrayAccessor<Float, Axis<3> > i3(i1);
+  ArrayAccessor<Float, Axis<asap::ChanAxis> > i3(i1);
 
   // Polarization.
-  ArrayAccessor<Float, Axis<2> > i2(i3);
-  ArrayAccessor<Float, Axis<0> > o0(tsys);
+  ArrayAccessor<Float, Axis<asap::PolAxis> > i2(i3);
+  ArrayAccessor<Float, Axis<asap::BeamAxis> > o0(tsys);
 
   while (i2 != i2.end()) {
@@ -298 +299 @@
 Array<Double> SDContainer::getDirection(uInt whichBeam) const {
   Vector<Double> direct(2);
-  ArrayAccessor<Double, Axis<0> > i0(direction_);
+  ArrayAccessor<Double, Axis<asap::BeamAxis> > i0(direction_);
   i0.reset(i0.begin(whichBeam));
-  ArrayAccessor<Double, Axis<0> > o0(direct);
-  ArrayAccessor<Double, Axis<1> > i1(i0);
+  ArrayAccessor<Double, Axis<asap::BeamAxis> > o0(direct);
+  ArrayAccessor<Double, Axis<asap::IFAxis> > i1(i0);
   while (i1 != i1.end()) {
     *o0 = *i1;
@@ -324 +325 @@
 Bool SDContainer::setDirection(const Vector<Double>& point, uInt whichBeam) {
   if (point.nelements() != 2) return False;
-  ArrayAccessor<Double, Axis<0> > aa0(direction_);
+  ArrayAccessor<Double, Axis<asap::BeamAxis> > aa0(direction_);
   aa0.reset(aa0.begin(whichBeam));
-  ArrayAccessor<Double, Axis<0> > jj(point);
-  for (ArrayAccessor<Double, Axis<1> > i(aa0);i != i.end(); ++i) {
+  ArrayAccessor<Double, Axis<asap::BeamAxis> > jj(point);
+  for (ArrayAccessor<Double, Axis<asap::IFAxis> > i(aa0);i != i.end(); ++i) {
     
     (*i) = (*jj);
@@ -338 +339 @@
   direction_.resize();
   direction_ = dir;
+  return True;
+}
+
+Bool SDContainer::appendHistory(const String& hist)
+{
+  history_.resize(history_.nelements()+1,True);
+  history_[history_.nelements()-1] = hist;
+  return True;
+}
+Bool SDContainer::putHistory(const Vector<String>& hist)
+{
+  history_.resize();
+  history_ = hist;
   return True;
 }
@@ -367 +381 @@
 }
 
+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;
+      }
+    }
+    if (!found) {
+      restFreqs_.resize(restFreqs_.nelements()+1,True);
+      restFreqs_[restFreqs_.nelements()-1] = val;
+    }
+  }
+}
+void SDFrequencyTable::restFrequencies(Vector<Double>& rfs, 
+                                       String& rfunit ) const
+{
+  rfs.resize(restFreqs_.nelements());
+  rfs = restFreqs_;
+  rfunit = restFreqUnit_;
+}

trunk/src/SDContainer.h

@@ -59 +59 @@
   casa::Double bandwidth;
   casa::Double utc;
+  casa::String fluxunit;
+  casa::String epoch;
   void print() const ;
 };
@@ -76 +78 @@
   casa::Float equinox() const { return equinox_; }
   casa::String refFrame() const { return refFrame_; }
+  void restFrequencies(casa::Vector<casa::Double>& rfs, 
+                       casa::String& rfunit ) const ;
 
   // returns the index into the table
@@ -83 +87 @@
   void setEquinox(casa::Float eq) { equinox_ = eq; }
   void setRefFrame(const casa::String& reff) { refFrame_ = reff; }
-  
+  void addRestFrequency(casa::Double);
+  void setRestFrequencyUnit(const casa::String& theunit) {
+    restFreqUnit_ = theunit;
+  };
+
 private:
   casa::Int nFreq_;
@@ -91 +99 @@
   casa::Float equinox_;
   casa::String refFrame_;
+  casa::Vector<casa::Double> restFreqs_;
+  casa::String restFreqUnit_;
 };
 
@@ -139 +149 @@
   const casa::Vector<casa::uInt>& getFreqMap() const { return freqidx_; }
   
+  const casa::Vector<casa::String>& getHistory() const { return history_; }
+  casa::Bool putHistory(const casa::Vector<casa::String>& hist);
+  casa::Bool appendHistory(const casa::String& hist);
+
   casa::Double timestamp;
   //Double bandwidth;
@@ -168 +182 @@
   //(nBeam,2) maybe use Measures here...
   casa::Array<casa::Double>   direction_;
+  casa::Vector<casa::String> history_;
 
 };