Changeset 1140 for trunk/src/STMath.cpp

Timestamp:

08/16/06 09:12:28 (18 years ago)

Author:

mar637

Message:

add mxExtract the first step to do MX quotients

File:

• trunk/src/STMath.cpp (modified) (6 diffs)

trunk/src/STMath.cpp

@@ -15 +15 @@
 #include <casa/Containers/Block.h>
 #include <casa/BasicSL/String.h>
-#include <tables/Tables/TableIter.h>
-#include <tables/Tables/TableCopy.h>
 #include <casa/Arrays/MaskArrLogi.h>
 #include <casa/Arrays/MaskArrMath.h>
@@ -29 +27 @@
 #include <tables/Tables/ExprNode.h>
 #include <tables/Tables/TableRecord.h>
+#include <tables/Tables/TableParse.h>
 #include <tables/Tables/ReadAsciiTable.h>
+#include <tables/Tables/TableIter.h>
+#include <tables/Tables/TableCopy.h>
 
 #include <lattices/Lattices/LatticeUtilities.h>
@@ -203 +204 @@
   ArrayColumn<uChar> flagColOut(tout,"FLAGTRA");
   ArrayColumn<Float> tsysColOut(tout,"TSYS");
-
+  ScalarColumn<uInt> scanColOut(tout,"SCANNO");
+  Table tmp = in->table().sort("BEAMNO");
   Block<String> cols(3);
   cols[0] = String("BEAMNO");
@@ -214 +216 @@
   uInt outrowCount = 0;
   uChar userflag = 1 << 7;
-  TableIterator iter(in->table(), cols);
+  TableIterator iter(tmp, cols);
   while (!iter.pastEnd()) {
     Table subt = iter.table();
@@ -224 +226 @@
     tout.addRow();
     TableCopy::copyRows(tout, subt, outrowCount, 0, 1);
+    if ( avmode != "SCAN") {
+      scanColOut.put(outrowCount, uInt(0));
+    }
     Vector<Float> tmp;
     specCol.get(0, tmp);
@@ -1323 +1328 @@
 }
 
+CountedPtr< Scantable > 
+  asap::STMath::mxExtract( const CountedPtr< Scantable > & in,
+                           const std::string & scantype )
+{
+  bool insitu = insitu_;
+  setInsitu(false);
+  CountedPtr< Scantable > out = getScantable(in, true);
+  setInsitu(insitu);
+  Table& tout = out->table();
+  std::string taql = "SELECT FROM $1 WHERE BEAMNO != REFBEAMNO";
+  if (scantype == "on") {
+    taql = "SELECT FROM $1 WHERE BEAMNO == REFBEAMNO";
+  }
+  Table tab = tableCommand(taql, in->table());
+  TableCopy::copyRows(tout, tab);
+  if (scantype == "on") {
+    TableVector<uInt> vec(tout, "SCANNO");
+    vec = 0;
+  }
+  return out;
+}