Changeset 902 for trunk

Timestamp:

03/17/06 10:10:59 (19 years ago)

Author:

mar637

Message:

More work on polarisation. STPol and labelling

Location:

trunk/src

Files:

• STMath.cpp (modified) (1 diff)
• STSelector.cpp (modified) (4 diffs)
• STSelector.h (modified) (5 diffs)
• Scantable.cpp (modified) (10 diffs)
• Scantable.h (modified) (4 diffs)
• ScantableWrapper.h (modified) (2 diffs)
• python_STSelector.cpp (modified) (2 diffs)
• python_Scantable.cpp (modified) (2 diffs)

trunk/src/STMath.cpp

@@ -903 +903 @@
   TableIterator iter(tout, cols);
   STPol* stpol = NULL;
-  stpol =STPol::getPolClass(Scantable::getFactories(), out->getPolType() );
+  stpol =STPol::getPolClass(out->factories_, out->getPolType() );
   while (!iter.pastEnd()) {
     Table t = iter.table();

trunk/src/STSelector.cpp

@@ -16 +16 @@
 #include <casa/iostream.h>
 #include <casa/iomanip.h>
+#include <casa/Exceptions/Error.h>
 
 #include "MathUtils.h"
+#include "STPol.h"
 #include "STSelector.h"
 
@@ -99 +101 @@
 }
 
+
+void asap::STSelector::setSortOrder( const std::vector< std::string > & order )
+{
+  order_.resize(order.size(), True);
+  for (int i=0;i<order.size();++i) {
+    order_[i] = order[i];
+  }
+}
+
 Table STSelector::apply( const Table& tab )
 {
   if ( empty() ) {
-    return tab;
+    return sort(tab);
   }
   TableExprNode query;
@@ -132 +143 @@
       tmpt = tableCommand(taql_, tab);
     }
-    return tmpt;
+    return sort(tmpt);
   } else {
-    return tab(query);
+    if ( query.isNull() ) {
+      return sort(tab);
+    } else {
+      return sort(tab(query));
+    }
   }
 }
@@ -207 +222 @@
   return (intselections_.empty() && taql_.size() == 0 );
 }
+
+casa::Table asap::STSelector::sort( const casa::Table & tab )
+{
+  if (order_.nelements() > 0) {
+    cout << "sorting" << endl;
+    Table t = tab.sort(order_);
+    return t;
+  } else {
+    return tab;
+  }
+}
+
+
+void asap::STSelector::setPolFromStrings( const std::vector< std::string >& pols )
+{
+  poltypes_.clear();
+  std::vector<int> polints;
+  std::vector<std::string>::const_iterator strit = pols.begin();
+  for (strit; strit != pols.end(); ++strit) {
+    std::pair<int, std::string> val;
+    try {
+       val = STPol::polFromString(*strit);
+    } catch (AipsError& e) {
+      poltypes_.clear();
+      throw(e);
+    }
+    polints.push_back(val.first);
+    poltypes_.push_back(val.second);
+  }
+  setint("POLNO", polints);
+}
+
+std::vector< std::string > asap::STSelector::getPolTypes( )
+{
+  return poltypes_;
+}

trunk/src/STSelector.h

@@ -17 +17 @@
 #include <map>
 
+#include <casa/Containers/Block.h>
+#include <casa/BasicSL/String.h>
 #include <tables/Tables/Table.h>
 
@@ -40 +42 @@
   void setIFs(const std::vector<int>& ifs);
   void setPolarizations(const std::vector<int>& pols);
+  void setPolFromStrings(const std::vector<std::string>& pols);
   void setCycles(const std::vector<int>& cycs);
   void setName(const std::string&);
   virtual void setTaQL(const std::string& taql);
+
+  void setSortOrder(const std::vector<std::string>& order);
 
   std::vector<int> getScans();
@@ -49 +54 @@
   std::vector<int> getPols();
   std::vector<int> getCycles();
+  std::vector<std::string> getPolTypes();
 
   casa::Table apply(const casa::Table& tab);
@@ -67 +73 @@
 
 private:
+
+  casa::Table sort(const casa::Table& tab);
+
   typedef std::map<std::string, std::vector<int> > intidmap;
   typedef std::map<std::string, std::vector<std::string> > stringidmap;
@@ -72 +81 @@
   mutable intidmap intselections_;
   mutable stringidmap stringselections_;
+  std::vector<std::string> poltypes_;
+  casa::Block<casa::String> order_;
   std::string taql_;
 };

trunk/src/Scantable.cpp

@@ -28 +28 @@
 #include <casa/Quanta/MVAngle.h>
 #include <casa/Containers/RecordField.h>
+#include <casa/Utilities/GenSort.h>
 
 #include <tables/Tables/TableParse.h>
@@ -56 +57 @@
 #include "STPolLinear.h"
 #include "STAttr.h"
+#include "MathUtils.h"
 
 using namespace casa;
@@ -126 +128 @@
                             Bool(clear));
       table_ = Table(newname, Table::Update);
-      copySubtables(other);
+      if ( clear ) copySubtables(other);
       table_.markForDelete();
   }
@@ -328 +330 @@
 int Scantable::nscan() const {
   int n = 0;
-  int previous = -1; int current = 0;
-  for (uInt i=0; i< scanCol_.nrow();i++) {
-    scanCol_.getScalar(i,current);
-    if (previous != current) {
-      previous = current;
-      n++;
-    }
-  }
-  return n;
+  Int previous = -1; Int current = 0;
+  Vector<uInt> scannos(scanCol_.getColumn());
+  uInt nout = GenSort<uInt>::sort( scannos, Sort::Ascending,
+                       Sort::QuickSort|Sort::NoDuplicates );
+  return int(nout);
 }
 
@@ -482 +480 @@
     while ( !it.pastEnd() ) {
       ++n;
+      ++it;
     }
     return n;
@@ -595 +594 @@
 
 std::vector<float> Scantable::getSpectrum( int whichrow,
-                                           const std::string& poltype) const
-{
+                                           const std::string& poltype ) const
+{
+  if ( whichrow  < 0 || whichrow >= nrow() )
+    throw(AipsError("Illegal row number."));
   std::vector<float> out;
   Vector<Float> arr;
@@ -610 +611 @@
       stpol->setSpectra(getPolMatrix(row));
       Float frot,fang,ftan;
-      focusTable_.getEntry(frot, fang, ftan, row);
+      focusTable_.getEntry(frot, fang, ftan, mfocusidCol_(row));
       stpol->setPhaseCorrections(frot, fang, ftan);
       arr = stpol->getSpectrum(requestedpol, poltype);
@@ -619 +620 @@
     }
   }
+  if ( arr.nelements() == 0 )
+    pushLog("Not enough polarisations present to do the conversion.");
   arr.tovector(out);
   return out;
@@ -653 +656 @@
 {
   return table_.keywordSet().asString("POLTYPE");
-}
-
-
-std::string Scantable::getPolarizationLabel(bool linear, bool stokes,
-                                            bool linpol, int polidx) const
-{
-  uInt idx = 0;
-  if (polidx >=0) idx = polidx;
-  return "";
-  //return SDPolUtil::polarizationLabel(idx, linear, stokes, linpol);
 }
 
@@ -892 +885 @@
 }
 
-
-}//namespace asap
+std::vector< std::string > asap::Scantable::columnNames( ) const
+{
+  Vector<String> vec = table_.tableDesc().columnNames();
+  return mathutil::tovectorstring(vec);
+}
+
+} //namespace asap

trunk/src/Scantable.h

@@ -63 +63 @@
 class Scantable : private Logger
 {
+
+friend class STMath;
+
 public:
   /**
@@ -177 +180 @@
   /**
    * Return a list of row numbers with respect to the original table.
-   * @return a lsi of rownumbers with respect to the original table
+   * @return a list of unsigned ints
    */
   std::vector<unsigned int> rownumbers() const;
@@ -252 +255 @@
   void setSpectrum(const std::vector<float>& spec, int whichrow);
 
-  std::string getPolarizationLabel(bool linear, bool stokes,
-                                   bool linpol,
-                                   int polidx=-1) const;
+  std::string getPolarizationLabel(int index, const std::string& ptype) const
+    { return STPol::getPolLabel(index, ptype ); }
 
   /**
@@ -303 +305 @@
   STHistory& history() { return historyTable_; }
 
-  static const std::map<std::string, STPol::STPolFactory *>& getFactories()
-    { return factories_; }
+  std::vector<std::string> columnNames() const;
 
 private:

trunk/src/ScantableWrapper.h

@@ -69 +69 @@
   //  std::string getPolarizationLabel(bool linear, bool stokes, bool linPol, int polIdx) const {
   // Boost fails with 4 arguments.
-  std::string getPolarizationLabel(bool linear, bool stokes,
-                                   bool linPol) const {
-    int polIdx = -1;
-    return table_->getPolarizationLabel(linear, stokes, linPol, polIdx);
+  std::string getPolarizationLabel(int index, const std::string& ptype) const {
+    return table_->getPolarizationLabel(index, ptype);
   }
 
@@ -132 +130 @@
   int nscan() const {return table_->nscan();}
   int nrow() const {return table_->nrow();}
+  int ncycle(int scanno) const {return table_->ncycle(scanno);}
   ///@todo int nstokes() {return table_->nStokes();}
 

trunk/src/python_STSelector.cpp

@@ -25 +25 @@
         .def("_getifs", &STSelector::getIFs)
         .def("_getpols", &STSelector::getPols)
+        .def("_getpoltypes", &STSelector::getPolTypes)
         .def("_getscans", &STSelector::getScans)
         .def("_getcycles", &STSelector::getCycles)
@@ -31 +32 @@
         .def("_setifs", &STSelector::setIFs)
         .def("_setpols", &STSelector::setPolarizations)
+        .def("_setpolstrings", &STSelector::setPolFromStrings)
         .def("_setscans", &STSelector::setScans)
         .def("_setcycles", &STSelector::setCycles)
         .def("_setname", &STSelector::setName)
         .def("_settaql", &STSelector::setTaQL)
+        .def("_setorder", &STSelector::setSortOrder)
       ;
     };

trunk/src/python_Scantable.cpp

@@ -53 +53 @@
     .def("getscan", &ScantableWrapper::getScan)
     .def("getcycle", &ScantableWrapper::getCycle)
-    .def("nif", &ScantableWrapper::nif)
-    .def("nbeam", &ScantableWrapper::nbeam)
-    .def("npol", &ScantableWrapper::npol)
-    .def("nchan", &ScantableWrapper::nchan)
+    .def("nif", &ScantableWrapper::nif,
+         (boost::python::arg("scanno")=-1) )
+    .def("nbeam", &ScantableWrapper::nbeam,
+         (boost::python::arg("scanno")=-1) )
+    .def("npol", &ScantableWrapper::npol,
+         (boost::python::arg("scanno")=-1) )
+    .def("nchan", &ScantableWrapper::nchan,
+         (boost::python::arg("ifno")=-1) )
+    .def("ncycle", &ScantableWrapper::ncycle,
+         (boost::python::arg("scanno")=-1) )
     .def("nscan", &ScantableWrapper::nscan)
     .def("nrow", &ScantableWrapper::nrow)
@@ -65 +71 @@
          (arg("whichrow")=0, arg("poltype")=std::string("linear")) )
     .def("poltype", &ScantableWrapper::getPolType )
-    .def("_getpolarizationlabel", &ScantableWrapper::getPolarizationLabel,
-         ( arg("linear")=false, arg("stokes")=false,
-           arg("linpol")=false, arg("thepol")=0 ) )
+    .def("_getpollabel", &ScantableWrapper::getPolarizationLabel)
     .def("_setspectrum",&ScantableWrapper::setSpectrum,
          (boost::python::arg("whichrow")=0) )