Changeset 1189 for trunk/src

Timestamp:

08/28/06 12:28:27 (18 years ago)

Author:

mar637

Message:

Fix for ticket #61 - changing of default polarisation. Done ticket #62 as far as possible. Tid data gets automatically set as 'circular'\nAlso add circular pol class which was missing so far.

Location:

trunk/src

Files:

• STPolCircular.cpp (added)
• STPolCircular.h (added)
• STPolLinear.cpp (modified) (5 diffs)
• Scantable.cpp (modified) (3 diffs)
• Scantable.h (modified) (1 diff)
• ScantableWrapper.h (modified) (1 diff)
• python_Scantable.cpp (modified) (1 diff)

trunk/src/STPolLinear.cpp

@@ -49 +49 @@
         break;
     }
+  } else if (nspec() == 2) {
+    if ( index == 0 )
+      out = Vector<Float>(getSpectrum(0) + getSpectrum(1));
   }
   return out;
@@ -55 +58 @@
 Vector<Float> asap::STPolLinear::getLinPol( uInt index )
 {
+  if (nspec() != 4) {
+    throw(AipsError("You must have 4 linear polarizations to run this function"));
+  }
   if ( index < 0 || index >4 ) throw(AipsError("LinPol index out of range"));
   Vector<Float> out,q,u;
@@ -87 +93 @@
   //   We use the convention
   //    I = (RR+LL)  // definition changed
-
+  if (nspec() != 4) {
+    throw(AipsError("You must have 4 linear polarizations to run this function"));
+  }
   if ( index == 2 || index ==3  ) throw(AipsError("Re/Imag RL not implemented"));
   Vector<Float> I,V,out;
@@ -121 +129 @@
 {
   // phase isnt used, just ro keep interface the same for all pol operations
+  if (nspec() != 4) {
+    throw(AipsError("You must have 4 linear polarizations to run this function"));
+  }
   Matrix<Float>& specs = getSpectra();
   Vector<Float> I = specs.column(3);
@@ -135 +146 @@
 // C1 = XX; C2 = YY, C3 = Real(XY)
 //
+  if (nspec() != 4) {
+    throw(AipsError("You must have 4 linear polarizations to run this function"));
+  }
   Vector<Float> I,Q,U;
   I = getStokes(0);

trunk/src/Scantable.cpp

@@ -56 +56 @@
 #include "Scantable.h"
 #include "STPolLinear.h"
+#include "STPolCircular.h"
 #include "STPolStokes.h"
 #include "STAttr.h"
@@ -69 +70 @@
   if ( factories_.empty() ) {
     Scantable::factories_["linear"] = &STPolLinear::myFactory;
+    Scantable::factories_["circular"] = &STPolStokes::myFactory;
     Scantable::factories_["stokes"] = &STPolStokes::myFactory;
   }
@@ -398 +400 @@
   nameU.upcase();
   table_.rwKeywordSet().define(String("AntennaName"), nameU);
+}
+
+void Scantable::setFeedType(const std::string& feedtype)
+{
+  if ( Scantable::factories_.find(feedtype) ==  Scantable::factories_.end() ) {
+    std::string msg = "Illegal feed type "+ feedtype;
+    throw(casa::AipsError(msg));
+  }
+  table_.rwKeywordSet().define(String("POLTYPE"), feedtype);
 }
 

trunk/src/Scantable.h

@@ -202 +202 @@
 
   /**
+   * Set the Stokes type of the data
+   * @param a string representing the type, e.g "circular" or "linear"
+   */
+  void setFeedType( const std::string& feedtype );
+
+  /**
    *
    * @param instrument a string representing an insturment. see xxx

trunk/src/ScantableWrapper.h

@@ -93 +93 @@
 
   void setInstrument(const std::string& name) {table_->setInstrument(name);}
+  void setFeedType(const std::string& ftype) {table_->setFeedType(ftype);}
 
   std::vector<bool> getMask(int whichrow=0) const

trunk/src/python_Scantable.cpp

@@ -73 +73 @@
     .def("set_fluxunit", &ScantableWrapper::setFluxUnit)
     .def("_setInstrument", &ScantableWrapper::setInstrument)
+    .def("_setfeedtype", &ScantableWrapper::setFeedType)
     .def("_getspectrum", &ScantableWrapper::getSpectrum,
          (arg("whichrow")=0, arg("poltype")=std::string("")) )