Changeset 1188 for trunk

Timestamp:

08/28/06 12:20:39 (18 years ago)

Author:

mar637

Message:

changed feedtype to be string and added detection of feedtype to filler.

Location:

trunk/src

Files:

• STAttr.cpp (modified) (11 diffs)
• STAttr.h (modified) (2 diffs)
• STFiller.cpp (modified) (2 diffs)

trunk/src/STAttr.cpp

@@ -57 +57 @@
 }
 
-STAttr& STAttr::operator=(const STAttr& other) 
+STAttr& STAttr::operator=(const STAttr& other)
 {
   if (this != &other) {
@@ -107 +107 @@
 }
 
-Vector<Float> STAttr::beamEfficiency(Instrument inst, const MEpoch& dateObs, 
+Vector<Float> STAttr::beamEfficiency(Instrument inst, const MEpoch& dateObs,
                                       const Vector<Float>& freqs) const
 {
@@ -122 +122 @@
             pushLog("There is no beam efficiency data from before 2003"
                     " - using 2003 data");
-            facs = interp(freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2003Y_); 
+            facs = interp(freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2003Y_);
           } else if (year==2003) {
             pushLog("Using beam efficiency data from 2003");
-            facs = interp(freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2003Y_); 
+            facs = interp(freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2003Y_);
           } else {
             pushLog("Using beam efficiency data from 2004");
-            facs = interp(freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2004Y_); 
+            facs = interp(freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2004Y_);
           }
         }
@@ -140 +140 @@
 }
 
-Vector<Float> STAttr::apertureEfficiency(Instrument inst, 
-                                         const MEpoch& dateObs, 
+Vector<Float> STAttr::apertureEfficiency(Instrument inst,
+                                         const MEpoch& dateObs,
                                          const Vector<Float>& freqs) const
 {
-  
+
   // Look at date where appropriate
   MVTime t(dateObs.getValue());
   uInt year = t.year();
-  
+
   Vector<Float> facs(freqs.nelements(),1.0);
   switch (inst) {
@@ -180 +180 @@
                              const Vector<Float>& freqs) const
 {
-  
+
   // Find what we need
   Vector<Float> etaAp = apertureEfficiency(inst, dateObs, freqs);
@@ -223 +223 @@
 }
 
-FeedPolType STAttr::feedPolType(Instrument inst) const
-{
-  FeedPolType type = UNKNOWNFEED;
+std::string STAttr::feedPolType(Instrument inst) const
+{
+  std::string type;
   switch (inst) {
   case ATMOPRA:
@@ -231 +231 @@
   case ATPKSHOH:
     {
-      type = LINEAR;
+      type = "linear";
     }
     break;
   case TIDBINBILLA:
     {
-      type = CIRCULAR;
+      type = "circular";
     }
     break;
   default:
     {
-      type = UNKNOWNFEED;
+      type = "linear";
     }
   }
@@ -250 +250 @@
 // Private
 Vector<Float> STAttr::interp(const Vector<Float>& xOut,
-                             const Vector<Float>& xIn, 
+                             const Vector<Float>& xIn,
                              const Vector<Float>& yIn) const
 {
@@ -258 +258 @@
 
   Vector<Bool> mIn(xIn.nelements(),True);
-  
+
   InterpolateArray1D<Float,Float>::interpolate(yOut, mOut, xOut,
                                                xIn, yIn, mIn,
                                                method, True, True);
-  
+
   return yOut;
 }
 
-void STAttr::initData() 
+void STAttr::initData()
   //
   // Mopra data from Mopra web page
@@ -284 +284 @@
    MopEtaBeam2003Y_(1) = 0.37;
    MopEtaBeam2003Y_(2) = 0.37;          // replicated from (1)
-   
+
    MopEtaBeam2004Y_.resize(3);
    MopEtaBeam2004Y_(0) = 0.49;
@@ -321 +321 @@
   String t(instrument);
   t.upcase();
-  
+
   // The strings are what STReader returns, after cunning
   // interrogation of station names... :-(

trunk/src/STAttr.h

@@ -31 +31 @@
 #ifndef STATTR_H
 #define STATTR_H
+
+#include <string>
 
 #include <casa/aips.h>
@@ -88 +90 @@
   // Find feed polarization type of feeds. In future this needs to come
   // from the data themselves
-  FeedPolType feedPolType(Instrument) const;
+  std::string feedPolType(Instrument) const;
 
   // Helper function to check instrument (antenna) name and give enum

trunk/src/STFiller.cpp

@@ -112 +112 @@
   header_->nbeam = nBeam_;
 
-  // not the right thing to do?!
-  //if ( nPol_  == 1 ) header_->poltype = "stokes";
-  //else header_->poltype = "linear";
-  header_->poltype = "linear";
   Int status = reader_->getHeader(header_->observer, header_->project,
                                   header_->antennaname, header_->antennaposition,
@@ -145 +141 @@
      header_->fluxunit = "K";
   }
-
+  STAttr stattr;
+  header_->poltype = stattr.feedPolType(inst);
   header_->nif = nIF_;
   header_->epoch = "UTC";