Changeset 1222

Timestamp:

08/31/06 12:04:30 (18 years ago)

Author:

mar637

Message:

Ticket #66 fully implemeneted

File:

• tags/Release2.1.0b/src/STMath.cpp (modified) (1 diff)

tags/Release2.1.0b/src/STMath.cpp

@@ -1126 +1126 @@
                                 const std::string& weight )
 {
-  if (in->getPolType() != "linear"  || in->npol() != 2 )
-    throw(AipsError("averagePolarisations can only be applied to two linear polarisations."));
+  if (in->npol() <= 2 )
+    throw(AipsError("averagePolarisations can only be applied to two or more"
+                    "polarisations"));
   bool insitu = insitu_;
   setInsitu(false);
-  CountedPtr< Scantable > pols = getScantable(in, false);
+  CountedPtr< Scantable > pols = getScantable(in, true);
   setInsitu(insitu);
   Table& tout = pols->table();
-  // give all rows the same POLNO
+  std::string taql = "SELECT FROM $1 WHERE POLNO IN [0,1]";
+  Table tab = tableCommand(taql, in->table());
+  if (tab.nrow() == 0 )
+    throw(AipsError("Could not find  any rows with POLNO==0 and POLNO==1"));
+  TableCopy::copyRows(tout, tab);
   TableVector<uInt> vec(tout, "POLNO");
   vec = 0;