Changeset 992 for trunk

Timestamp:

04/06/06 10:12:03 (19 years ago)

Author:

mar637

Message:

added function to convert between polarisation types

Location:

trunk

Files:

• python/__init__.py (modified) (3 diffs)
• python/scantable.py (modified) (1 diff)
• src/STMath.cpp (modified) (1 diff)
• src/STMath.h (modified) (1 diff)
• src/STMathWrapper.h (modified) (1 diff)

trunk/python/__init__.py

@@ -232 +232 @@
 
 def unique(x):
+    """
+    Return the unique values in a list
+    Parameters:
+        x:      the list to reduce
+    Examples:
+        x = [1,2,3,3,4]
+        print unique(x)
+        [1,2,3,4]
+    """
     return dict([ (val, 1) for val in x]).keys()
+
+def list_files(path=".",suffix="rpf"):
+    """
+    Return a list files readable by asap, such as rpf, sdfits, mbf, asap
+    Parameters:
+        path:     The directory to list (default '.')
+        suffix:   The file extension (default rpf)
+    Example:
+        files = list_files("data/","sdfits")
+        print files
+        ['data/2001-09-01_0332_P363.sdfits',
+        'data/2003-04-04_131152_t0002.sdfits',
+        'data/Sgr_86p262_best_SPC.sdfits']
+    """
+    import os
+    if not os.path.isdir(path):
+        return None
+    valid = "rpf sdf sdfits mbf asap".split()
+    if not suffix in valid:
+        return None
+    files = [os.path.expanduser(os.path.expandvars(path+"/"+f)) for f in os.listdir(path)]
+    return filter(lambda x: x.endswith(suffix),files)
 
 # workaround for ipython, which redirects this if banner=0 in ipythonrc
@@ -335 +366 @@
                               all polarisations will contain the
                               averaged spectrum.
+            convert_pol     - convert to a different polarisation type
             auto_quotient   - return the on/off quotient with
                               automatic detection of the on/off scans
@@ -417 +449 @@
         print               - print details about a variable
         list_scans          - list all scantables created bt the user
+        list_files          - list all files readable by asap (default rpf)
         del                 - delete the given variable from memory
         range               - create a list of values, e.g.

trunk/python/scantable.py

@@ -974 +974 @@
         if mask is None:
             mask = ()
-        s = self._math._averagepol(self, mask, weight)
+        s = scantable(self._math._averagepol(self, mask, weight))
         s._add_history("average_pol",varlist)
         print_log()
-        return scantable(s)
+        return s
+
+    def convert_pol(self, poltype=None):
+        """
+        Convert the data to a different polarisation type.
+        Parameters:
+            poltype:    The new polarisation type. Valid types are:
+                        "linear", "stokes" and "circular"
+        """
+        varlist = vars()
+        try:
+            s = scantable(self._math._convertpol(self, poltype))
+        except RuntimeError,msg:
+            if rcParams['verbose']:
+              print msg
+              return
+            else:
+                raise
+        s._add_history("convert_pol",varlist)
+        print_log()
+        return s
 
     def smooth(self, kernel="hanning", width=5.0, insitu=None):

trunk/src/STMath.cpp

@@ -1128 +1128 @@
   return out;
 }
+
+CountedPtr<Scantable>
+  asap::STMath::convertPolarisation( const CountedPtr<Scantable>& in,
+                                     const std::string & newtype )
+{
+  if (in->npol() != 2 && in->npol() != 4)
+    throw(AipsError("Can only convert two or four polarisations."));
+  if ( in->getPolType() == newtype )
+    throw(AipsError("No need to convert."));
+  bool insitu = insitu_;
+  setInsitu(false);
+  CountedPtr< Scantable > out = getScantable(in, true);
+  setInsitu(insitu);
+  Table& tout = out->table();
+  tout.rwKeywordSet().define("POLTYPE", String(newtype));
+
+  Block<String> cols(4);
+  cols[0] = "SCANNO";
+  cols[1] = "CYCLENO";
+  cols[2] = "BEAMNO";
+  cols[3] = "IFNO";
+  TableIterator it(in->originalTable_, cols);
+  String basetype = in->getPolType();
+  STPol* stpol = STPol::getPolClass(in->factories_, basetype);
+  try {
+    while ( !it.pastEnd() ) {
+      Table tab = it.table();
+      uInt row = tab.rowNumbers()[0];
+      stpol->setSpectra(in->getPolMatrix(row));
+      Float fang,fhand,parang;
+      fang = in->focusTable_.getTotalFeedAngle(in->mfocusidCol_(row));
+      fhand = in->focusTable_.getFeedHand(in->mfocusidCol_(row));
+      parang = in->paraCol_(row);
+      /// @todo re-enable this
+      // disable total feed angle to support paralactifying Caswell style
+      stpol->setPhaseCorrections(parang, -parang, fhand);
+      Int npolout = 0;
+      for (uInt i=0; i<tab.nrow(); ++i) {
+        Vector<Float> outvec = stpol->getSpectrum(i, newtype);
+        if ( outvec.nelements() > 0 ) {
+          tout.addRow();
+          TableCopy::copyRows(tout, tab, tout.nrow()-1, 0, 1);
+          ArrayColumn<Float> sCol(tout,"SPECTRA");
+          ScalarColumn<uInt> pCol(tout,"POLNO");
+          sCol.put(tout.nrow()-1 ,outvec);
+          pCol.put(tout.nrow()-1 ,uInt(npolout));
+          npolout++;
+       }
+      }
+      tout.rwKeywordSet().define("nPol", npolout);
+      ++it;
+    }
+  } catch (AipsError& e) {
+    delete stpol;
+    throw(e);
+  }
+  delete stpol;
+  return out;
+}

trunk/src/STMath.h

@@ -122 +122 @@
                     const std::string& method = "cubic" );
 
+  casa::CountedPtr<Scantable>
+    convertPolarisation( const casa::CountedPtr<Scantable>& in,
+                         const std::string& newtype);
+
 private:
   casa::CountedPtr<Scantable>  applyToPol( const casa::CountedPtr<Scantable>& in,

trunk/src/STMathWrapper.h

@@ -126 +126 @@
   { return ScantableWrapper(STMath::frequencyAlign(in.getCP())); }
 
+  ScantableWrapper convertPolarisation( const ScantableWrapper& in,
+                                        const std::string& newtype )
+  { return ScantableWrapper(STMath::convertPolarisation(in.getCP(),newtype)); }
+
 };