Changeset 2789 for trunk/src

Timestamp:

03/14/13 16:22:24 (12 years ago)

Author:

Malte Marquarding

Message:

Ticket #288: implemented dropping of xpols as scantable.drop_xpol()

Location:

trunk/src

Files:

• Scantable.cpp (modified) (1 diff)
• Scantable.h (modified) (1 diff)
• ScantableWrapper.h (modified) (1 diff)
• python_Scantable.cpp (modified) (1 diff)

trunk/src/Scantable.cpp

@@ -5194 +5194 @@
 
 
+void Scantable::dropXPol()
+{
+  if (npol() <= 2) {
+    return;
+  }
+  if (!selector_.empty()) {
+    throw AipsError("Can only operate with empty selection");
+  }
+  std::string taql = "SELECT FROM $1 WHERE POLNO IN [0,1]";
+  Table tab = tableCommand(taql, table_);
+  table_ = tab;
+  table_.rwKeywordSet().define("nPol", Int(2));
+  originalTable_ = table_;
+  attach();
+}
+
 }
 //namespace asap

trunk/src/Scantable.h

@@ -635 +635 @@
                                          int chanAvgLimit);
   static std::vector<bool> getMaskFromMaskList(const int nchan,
-                                               const std::vector<int>& masklist);
-  static casa::Vector<casa::uInt> getMaskListFromMask(const std::vector<bool>& mask);
-  static std::vector<int> splitToIntList(const std::string& str, const char delim);
-  static std::vector<string> splitToStringList(const std::string& str, const char delim);
-
-
+                                          const std::vector<int>& masklist);
+  static casa::Vector<casa::uInt> getMaskListFromMask(
+                                           const std::vector<bool>& mask);
+  static std::vector<int> splitToIntList(const std::string& str, 
+                                         const char delim);
+  static std::vector<string> splitToStringList(const std::string& str, 
+                                               const char delim);
+
+  void dropXPol();
 
 private:

trunk/src/ScantableWrapper.h

@@ -328 +328 @@
   { return table_->calculateModelSelectionCriteria(valname, blfunc, order, inMask, whichrow, useLineFinder, edge, threshold, chanAvgLimit); }
 
+  void dropXPol() { table_->dropXPol(); }
+
 private:
   casa::CountedPtr<Scantable> table_;

trunk/src/python_Scantable.cpp

@@ -166 +166 @@
     .def("_setmolidcol_list", &ScantableWrapper::setMoleculeIdColumnData)
     .def("_calc_aic", &ScantableWrapper::calculateModelSelectionCriteria)
+    .def("drop_xpol", &ScantableWrapper::dropXPol)
   ;
 };