Changeset 1140 for trunk/src

Timestamp:

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

Author:

mar637

Message:

add mxExtract the first step to do MX quotients

Location:

trunk/src

Files:

• STMath.cpp (modified) (6 diffs)
• STMath.h (modified) (4 diffs)
• STMathWrapper.h (modified) (1 diff)
• python_STMath.cpp (modified) (1 diff)

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;
+}

trunk/src/STMath.h

@@ -62 +62 @@
 
 
-        /**
-          * average a vector of Scantables
-          * @param in the vector of Scantables to average
-          * @param an optional mask to apply on specific weights
-          * @param weight weighting scheme
-          * @param avmode the mode ov averaging. Per "SCAN" or "ALL".
-          * @return a casa::CountedPtr<Scantable> which either holds a new Scantable
-          * or returns the imput pointer.
-          */
+  /**
+    * average a vector of Scantables
+    * @param in the vector of Scantables to average
+    * @param an optional mask to apply on specific weights
+    * @param weight weighting scheme
+    * @param avmode the mode ov averaging. Per "SCAN" or "ALL".
+    * @return a casa::CountedPtr<Scantable> which either holds a new Scantable
+    * or returns the imput pointer.
+    */
   casa::CountedPtr<Scantable>
     average( const std::vector<casa::CountedPtr<Scantable> >& in,
@@ -77 +77 @@
              const std::string& avmode = "SCAN");
 
-        /**
-          * median average a vector of Scantables. See also STMath::average
-          * @param in the Scantable to average
-          * @param mode the averaging mode. Currently only "MEDIAN"
-          * @param avmode the mode ov averaging. Per "SCAN" or "ALL".
-          * @return a casa::CountedPtr<Scantable> which either holds a new Scantable
-          * or returns the imput pointer.
-          */
+  /**
+    * median average a vector of Scantables. See also STMath::average
+    * @param in the Scantable to average
+    * @param mode the averaging mode. Currently only "MEDIAN"
+    * @param avmode the mode ov averaging. Per "SCAN" or "ALL".
+    * @return a casa::CountedPtr<Scantable> which either holds a new Scantable
+    * or returns the imput pointer.
+    */
   casa::CountedPtr<Scantable>
     averageChannel( const casa::CountedPtr<Scantable> & in,
@@ -90 +90 @@
                     const std::string& avmode = "SCAN");
 
+  /**
+    * average polarisations together. really only useful if only linears are
+    *  available.
+    * @param in the input Scantable
+    * @param mask an optional mask if weight allows one
+    * @param weight weighting scheme
+    * @return 
+    */
   casa::CountedPtr< Scantable >
     averagePolarisations( const casa::CountedPtr< Scantable > & in,
-                                const std::vector<bool>& mask,
-                                const std::string& weight );
+                          const std::vector<bool>& mask,
+                          const std::string& weight );
 
   casa::CountedPtr<Scantable>
@@ -159 +167 @@
     convertPolarisation( const casa::CountedPtr<Scantable>& in,
                          const std::string& newtype);
+  
+  casa::CountedPtr<Scantable>
+      mxExtract( const casa::CountedPtr<Scantable>& in,
+                 const std::string& scantype = "on" );
 
 private:

trunk/src/STMathWrapper.h

@@ -144 +144 @@
                                         const std::string& newtype )
   { return ScantableWrapper(STMath::convertPolarisation(in.getCP(),newtype)); }
+  
+  ScantableWrapper mxExtract( const ScantableWrapper& in,
+                              const std::string& scantype="on" )
+  { return ScantableWrapper(STMath::mxExtract(in.getCP(),scantype)); }
 
 };

trunk/src/python_STMath.cpp

@@ -65 +65 @@
         .def("_swap_linears", &STMathWrapper::swapPolarisations)
         .def("_freq_align", &STMathWrapper::frequencyAlign)
-      ;
+        .def("_mx_extract", &STMathWrapper::mxExtract)
+          ;
     };