Changeset 1069 for trunk

Timestamp:

07/04/06 14:44:44 (18 years ago)

Author:

mar637

Message:

enhancement ticket #35. median scantable

Location:

trunk

Files:

• python/__init__.py (modified) (4 diffs)
• src/STMath.cpp (modified) (2 diffs)
• src/STMath.h (modified) (1 diff)
• src/STMathWrapper.h (modified) (1 diff)
• src/python_STMath.cpp (modified) (1 diff)

trunk/python/__init__.py

@@ -306 +306 @@
     del gui
 
+
 __date__ = '$Date$'.split()[1]
-__version__  = '2.0.1'
+__version__  = '2.1a'
 
 if rcParams['verbose']:
@@ -367 +368 @@
             average_time    - return the (weighted) time average of a scan
                               or a list of scans
+            average_channel - return the (median) average of a scantable
             average_pol     - average the polarisations together.
                               The dimension won't be reduced and
@@ -373 +375 @@
             convert_pol     - convert to a different polarisation type
             auto_quotient   - return the on/off quotient with
-                              automatic detection of the on/off scans
-                              (matched pairs and 1 off - n on)
+                              automatic detection of the on/off scans (closest
+                              in time off is selected)
             scale, *, /     - return a scan scaled by a given factor
             add, +, -       - return a scan with given value added
@@ -419 +421 @@
             simple_math     - simple mathematical operations on two scantables,
                               'add', 'sub', 'mul', 'div'
+            quotient        - build quotient of the given on and off scans
+                              (matched pairs and 1 off/n on are valid)
+
      [Fitting]
         fitter

trunk/src/STMath.cpp

@@ -189 +189 @@
 }
 
+CountedPtr< Scantable >
+  STMath::averageChannel( const CountedPtr < Scantable > & in,
+                          const std::string & mode )
+{
+  // clone as this is non insitu
+  bool insitu = insitu_;
+  setInsitu(false);
+  CountedPtr< Scantable > out = getScantable(in, true);
+  setInsitu(insitu);
+  Table& tout = out->table();
+  ArrayColumn<Float> specColOut(tout,"SPECTRA");
+  ArrayColumn<uChar> flagColOut(tout,"FLAGTRA");
+  ArrayColumn<Float> tsysColOut(tout,"TSYS");
+
+  Block<String> cols(3);
+  cols[0] = String("BEAMNO");
+  cols[1] = String("IFNO");
+  cols[2] = String("POLNO");
+  uInt outrowCount = 0;
+  uChar userflag = 1 << 7;
+  TableIterator iter(in->table(), cols);
+  while (!iter.pastEnd()) {
+    Table subt = iter.table();
+    ROArrayColumn<Float> specCol, tsysCol;
+    ROArrayColumn<uChar> flagCol;
+    specCol.attach(subt,"SPECTRA");
+    flagCol.attach(subt,"FLAGTRA");
+    tsysCol.attach(subt,"TSYS");
+    tout.addRow();
+    TableCopy::copyRows(tout, subt, outrowCount, 0, 1);
+    Vector<Float> tmp;
+    specCol.get(0, tmp);
+    uInt nchan = tmp.nelements();
+    Vector<uChar> flags = flagCol.getColumn(Slicer(Slice(0)));
+    Vector<Float> outspec(nchan);
+    Vector<uChar> outflag(nchan,0);
+    Vector<Float> outtsys(1);/// @fixme when tsys is channel based
+    for (uInt i=0; i<nchan; ++i) {
+      Vector<Float> specs = specCol.getColumn(Slicer(Slice(i)));
+      MaskedArray<Float> ma = maskedArray(specs,flags);
+      outspec[i] = median(ma);
+      if ( allEQ(ma.getMask(), False) )
+        outflag[i] = userflag;// flag data
+    }
+    outtsys[0] = median(tsysCol.getColumn());
+    specColOut.put(outrowCount, outspec);
+    flagColOut.put(outrowCount, outflag);
+    tsysColOut.put(outrowCount, outtsys);
+
+    ++outrowCount;
+    ++iter;
+  }
+  return out;
+}
 
 CountedPtr< Scantable > STMath::getScantable(const CountedPtr< Scantable >& in,
@@ -331 +385 @@
 {
   bool insitu = insitu_;
+  if ( ! on->conformant(*off) ) {
+    throw(AipsError("'on' and 'off' scantables are not conformant."));
+  }
   setInsitu(false);
   CountedPtr< Scantable > out = getScantable(on, false);

trunk/src/STMath.h

@@ -58 +58 @@
              const std::string& weight = "NONE",
              const std::string& avmode = "SCAN");
+
+  casa::CountedPtr<Scantable>
+    averageChannel( const casa::CountedPtr<Scantable> & in,
+                     const std::string& mode = "MEDIAN");
 
   casa::CountedPtr< Scantable >

trunk/src/STMathWrapper.h

@@ -46 +46 @@
     return ScantableWrapper(STMath::average(sts, mask, weight, avmode));
   }
+
+  ScantableWrapper
+    averageChannel( const ScantableWrapper& in,
+                    const std::string& mode = "MEDIAN")
+  {
+    return ScantableWrapper(STMath::averageChannel(in.getCP(), mode));
+  }
+
   ScantableWrapper
     averagePolarisations( const ScantableWrapper& in,

trunk/src/python_STMath.cpp

@@ -45 +45 @@
         .def("_setinsitu", &STMathWrapper::setInsitu)
         .def("_average", &STMathWrapper::average)
+        .def("_averagechannel", &STMathWrapper::averageChannel)
         .def("_averagepol", &STMathWrapper::averagePolarisations)
         .def("_unaryop", &STMathWrapper::unaryOperate)