Changeset 443 for trunk

Timestamp:

02/15/05 11:59:01 (20 years ago)

Author:

kil064

Message:

add stokes conversion

Location:

trunk/src

Files:

• SDAsciiWriter.cc (modified) (3 diffs)
• SDAsciiWriter.h (modified) (1 diff)
• SDFITSImageWriter.cc (modified) (8 diffs)
• SDFITSImageWriter.h (modified) (1 diff)

trunk/src/SDAsciiWriter.cc

@@ -69 +69 @@
 
 
-Bool SDAsciiWriter::write(const SDMemTable& sdTable, const String& fileName)
+Bool SDAsciiWriter::write(const SDMemTable& sdTable, const String& fileName, Bool toStokes)
 {
 
@@ -112 +112 @@
 // Get data
 
-      const MaskedArray<Float>& dataIn(sdTable.rowAsMaskedArray(iRow));
+      const MaskedArray<Float>& dataIn(sdTable.rowAsMaskedArray(iRow,False,toStokes));
       const Array<Float>& values = dataIn.getArray();
       const Array<Bool>& mask = dataIn.getMask();
@@ -181 +181 @@
 
 
-Int SDAsciiWriter::convertStokes(Int val)
-{
-   Stokes::StokesTypes stokes = Stokes::RR;
-   if (val==0) {
-      stokes = Stokes::RR;
-   } else if (val==1) {
-      stokes = Stokes::LL;
-   } else if (val==2) {
-      stokes = Stokes::RL;
-   } else if (val==3) {
-      stokes = Stokes::LR;
-   } else {
-      stokes = Stokes::Undefined;
-   }
-//
-   return Int(stokes);
-}
-
 
 String SDAsciiWriter::formatDirection(const Vector<Double>& lonLat)

trunk/src/SDAsciiWriter.h

@@ -50 +50 @@
 
 // Write out ascii table
-  casa::Bool write(const SDMemTable& table, const casa::String& name);
+  casa::Bool write(const SDMemTable& table, const casa::String& name, casa::Bool toStokes);
 
 private:

trunk/src/SDFITSImageWriter.cc

@@ -52 +52 @@
 
 #include <measures/Measures/MEpoch.h>
+#include <measures/Measures/Stokes.h>
 
 #include <tables/Tables/Table.h>
@@ -60 +61 @@
 #include "SDContainer.h"
 #include "SDMemTable.h"
+#include "SDPol.h"
 
 using namespace casa;
@@ -73 +75 @@
 
 Bool SDFITSImageWriter::write(const SDMemTable& sdTable, 
-                              const String& dirName, Bool verbose)
+                              const String& dirName, Bool toStokes,
+                              Bool verbose)
 {
 
@@ -131 +134 @@
    Vector<Double> refPixLonLat(2,0.0);
 
+// Do we have linear or circular ?  No way to know yet...
+
+   Bool linear = True;
+
 // Loop over rows
 
@@ -147 +154 @@
    for (uInt iRow=0; iRow<nRows; iRow++) {
 
-// Get data
-
-      const MaskedArray<Float>& dataIn(sdTable.rowAsMaskedArray(iRow));
+// Get data converted to Stokes
+
+      const MaskedArray<Float>& dataIn(sdTable.rowAsMaskedArray(iRow,False,toStokes));
       const Array<Float>& values = dataIn.getArray();
       const Array<Bool>& mask = dataIn.getMask();
@@ -196 +203 @@
                                refPixLonLat[0], refPixLonLat[1]);
 
-// Form Stokes Coordinate (no true Stokes info yet);
-
-         whichStokes(0) = convertStokes(pos(stokesAxis));
+// Form Stokes Coordinate (Stokes info still sketchy);
+
+         Stokes::StokesTypes stokes = SDPolUtil::convertStokes(pos(stokesAxis), toStokes, linear);
+         String stokesName = Stokes::name(stokes);
+         whichStokes(0) = Int(stokes);
          StokesCoordinate stC(whichStokes);
 
@@ -226 +235 @@
          ostringstream oss;
          oss << "row" << iRow << "_beam" << pos(0) << "_if" 
-             << pos(1) << "_pol" << pos(2) << "_" << srcCol(iRow) << ".fits";
+             << pos(1) << "_" << stokesName  << "_" << srcCol(iRow) << ".fits";
          String tS(oss);
          String fileName = dirName2 + String("/") + tS;
@@ -256 +265 @@
 
 
-Int SDFITSImageWriter::convertStokes(Int val)
-{
-   Stokes::StokesTypes stokes = Stokes::RR;
-   if (val==0) {
-      stokes = Stokes::XX;
-   } else if (val==1) {
-      stokes = Stokes::YY;
-   } else if (val==2) {
-      stokes = Stokes::XY;
-   } else if (val==3) {
-      stokes = Stokes::YX;
-   } else {
-      stokes = Stokes::Undefined;
-   }
-//
-   return Int(stokes);
-}

trunk/src/SDFITSImageWriter.h

@@ -49 +49 @@
 // Write out lots of FITS images, one per row, beam, IF and polarization
   casa::Bool write(const SDMemTable& table, const casa::String& rootName,
-                   casa::Bool verbose=casa::True);
+                   casa::Bool toStokes, casa::Bool verbose=casa::True);
 
 private:
-   casa::Int convertStokes(casa::Int val);
+   casa::Int convertStokes(casa::Int val, casa::Bool toStokes, casa::Bool linear) const;
 };