Changeset 442 for trunk

Timestamp:

02/15/05 11:57:48 (20 years ago)

Author:

kil064

Message:

fix output reference pixel calculation
add stokes conversion

Location:

trunk/src

Files:

• SDWriter.cc (modified) (6 diffs)
• SDWriter.h (modified) (1 diff)

trunk/src/SDWriter.cc

@@ -111 +111 @@
 
 Int SDWriter::write(const CountedPtr<SDMemTable> in,
-                    const std::string &filename)
+                    const std::string &filename, Bool toStokes)
 {
 
@@ -119 +119 @@
      Bool verbose = True;
      SDFITSImageWriter iw;
-     if (iw.write(*in, filename, verbose)) {
+     if (iw.write(*in, filename, verbose, toStokes)) {
         return 0;
      } else {
@@ -126 +126 @@
   } else if (cFormat=="ASCII") {
      SDAsciiWriter iw;
-     if (iw.write(*in, filename)) {
+     if (iw.write(*in, filename, toStokes)) {
         return 0;
      } else {
@@ -139 +139 @@
   const Int nPol  = hdr.npol;
   const Int nChan = hdr.nchan;
+  if (toStokes) {
+     cerr << "Stokes conversion not yet available with SDFITS or MS" << endl;
+  }
 
 // Get Freq table
@@ -200 +203 @@
         Double          srcVel = 0.0;
 
-// The writer will assume refPix = nChan/2 + 1.  So recompute
+// The writer will assume refPix = nChan/2 (0-rel).  So recompute
 // the frequency at this location. 
 
@@ -206 +209 @@
         Double          crval = sdft.referenceValue(freqID);
         Double          crpix = sdft.referencePixel(freqID);
-        Double          pixel = nChan/2 + 1;
+        Double          pixel = nChan/2;
         Double          refFreqNew = (pixel-crpix)*cdelt + crval;
 //

trunk/src/SDWriter.h

@@ -50 +50 @@
 
 // Format can be "SDFITS", "FITS", "MS2" or "ASCII"
+// Stokes conversion available for FITS and ASCII at present
   casa::Int setFormat(const string &format = "SDFITS");
   casa::Int write(const casa::CountedPtr<SDMemTable> table,
-            const string &filename);
+            const string &filename, casa::Bool toStokes);
 
 private: