Changeset 827 for trunk/src

Timestamp:

02/17/06 15:01:57 (19 years ago)

Author:

mar637

Message:

First asap2 version which compiles

Location:

trunk/src

Files:

• STWriter.cpp (modified) (13 diffs)
• STWriter.h (modified) (2 diffs)

trunk/src/STWriter.cpp

@@ -42 +42 @@
 #include <atnf/PKSIO/PKSSDwriter.h>
 
+#include <tables/Tables/Table.h>
+#include <tables/Tables/TableIter.h>
+#include <tables/Tables/TableRow.h>
 #include <tables/Tables/ArrayColumn.h>
 
-
-
-
+//#include "SDFITSImageWriter.h"
+//#include "STAsciiWriter.h"
+//#include "SDPol.h"
 #include "SDContainer.h"
-#include "SDMemTable.h"
+
 #include "STWriter.h"
-#include "SDFITSImageWriter.h"
-#include "SDAsciiWriter.h"
-#include "SDPol.h"
 
 using namespace casa;
-using namespace asap;
-
-//--------------------------------------------------------- STWriter::STWriter
-
-// Default constructor.
+namespace asap {
 
 STWriter::STWriter(const std::string &format)
 {
-  cFormat = format;
-//
-  String t(cFormat);
-  t.upcase();
-  if (t== "MS2") {
-    cWriter = new PKSMS2writer();
-  } else if (t== "SDFITS") {
-    cWriter = new PKSSDwriter();
-  } else if (t== "FITS") {
-    cWriter = 0;
-  } else if (t== "ASCII") {
-    cWriter = 0;
-  } else {
-    throw (AipsError("Unrecognized Format"));
-  }
-}
-
-//-------------------------------------------------------- STWriter::~STWriter
-
-// Destructor.
-
-STWriter::~STWriter()
-{
-   if (cWriter) {
-     delete cWriter;
-   }
-}
-
-//-------------------------------------------------------- STWriter::setFormat
-
-// Reset the output format.
-
-Int STWriter::setFormat(const std::string &format)
-{
-  if (format != cFormat) {
-    if (cWriter) delete cWriter;
-  }
-//
   cFormat = format;
   String t(cFormat);
@@ -115 +73 @@
     throw (AipsError("Unrecognized Format"));
   }
+}
+
+STWriter::~STWriter()
+{
+   if (cWriter) {
+     delete cWriter;
+   }
+}
+
+Int STWriter::setFormat(const std::string &format)
+{
+  if (format != cFormat) {
+    if (cWriter) delete cWriter;
+  }
+
+  cFormat = format;
+  String t(cFormat);
+  t.upcase();
+  if (t== "MS2") {
+    cWriter = new PKSMS2writer();
+  } else if (t== "SDFITS") {
+    cWriter = new PKSSDwriter();
+  } else if (t== "FITS") {
+    cWriter = 0;
+  } else if (t== "ASCII") {
+    cWriter = 0;
+  } else {
+    throw (AipsError("Unrecognized Format"));
+  }
   return 0;
 }
 
-//------------------------------------------------------------ STWriter::write
-
-// Write an SDMemTable to file in the desired format, closing the file when
-// finished.
-
-Int STWriter::write(const CountedPtr<SDMemTable> in,
-                    const std::string &filename, Bool toStokes)
+Int STWriter::write(const CountedPtr<Scantable> in,
+                    const std::string &filename)
 {
 
@@ -130 +112 @@
 
   if (cFormat=="FITS") {
-     Bool verbose = True;
-     SDFITSImageWriter iw;
-     if (iw.write(*in, filename, verbose, toStokes)) {
+//      Bool verbose = True;
+//      SDFITSImageWriter iw;
+//      if (iw.write(*in, filename, verbose)) {
+//         return 0;
+//      } else {
+//         return 1;
+//      }
+  } else if (cFormat=="ASCII") {
+     /*SDAsciiWriter iw;
+     if (iw.write(*in, filename)) {
         return 0;
      } else {
         return 1;
-     }
-  } else if (cFormat=="ASCII") {
-     SDAsciiWriter iw;
-     if (iw.write(*in, filename, toStokes)) {
-        return 0;
-     } else {
-        return 1;
-     }
-  }
-
-// MS or SDFITS
+     }*/
+  }
+
+  // MS or SDFITS
 
   // Extract the header from the table.
@@ -153 +135 @@
   const Int nChan = hdr.nchan;
 
-// Get Freq table
-
-  SDFrequencyTable sdft = in->getSDFreqTable();
-  Vector<Double> restFreqs;
-  String restFreqUnit;
-  sdft.restFrequencies(restFreqs, restFreqUnit);
-  Double restFreq = 0.0;
-  if (restFreqs.nelements()>0) {
-     Quantum<Double> rF(restFreqs(0), Unit(restFreqUnit));
-     restFreq = rF.getValue(Unit("Hz"));
-  }
-
-// Table columns
-
   const Table table = in->table();
-  ROArrayColumn<uInt> freqIDCol(table, "FREQID");
-  Vector<uInt> freqIDs;
+//   ROArrayColumn<uInt> freqIDCol(table, "FREQ_ID");
+//   Vector<uInt> freqIDs;
 
   // Create the output file and write static data.
@@ -180 +148 @@
   }
 
-  Vector<Double>  srcPM(2, 0.0);
   Double          srcVel = 0.0;
-
-  Array<Float> spectra, tSys, stokes;
-  Array<uChar> flags;
-  Bool doLinear = True;
 
   String          fieldName, srcName, tcalTime;
@@ -203 +166 @@
     while (!beamit.pastEnd() ) {
       Table btable = beamit.table();
+      // position only varies by beam
+      MDirection::ScalarColumn dirCol(btable, "DIRECTION");
+      Vector<Double> direction = dirCol(0).getAngle("rad").getValue();
       TableIterator ifit(btable, "IFNO");
       Int ifno = 1;
@@ -213 +179 @@
           TableRow row(ctable);
           // use the first row to fill in all the "metadata"
-          const TableRecord& rec = row.record(0);
+          const TableRecord& rec = row.get(0);
           ROArrayColumn<Float> specCol(ctable, "SPECTRA");
           uInt nchan = specCol(0).nelements();
           Double cdelt,crval,crpix, restfreq;
-          String tmp,tmp2;
+          Float focusAxi, focusTan, focusRot,
+                temperature, pressure, humidity, windSpeed, windAz;
+          Vector<Float> tcalval;
+          String tmp,tmp2, tcalt;
           in->frequencies().getEntry(crpix,crval,cdelt, rec.asuInt("FREQ_ID"));
           in->molecules().getEntry(restfreq,tmp,tmp2,rec.asuInt("RESTFREQ_ID"));
+          in->tcal().getEntry(tcalt,tcalval,rec.asuInt("TCAL_ID"));
+          in->weather().getEntry(temperature, pressure, humidity,
+                                 windSpeed, windAz,
+                                 rec.asuInt("WEATHER_ID"));
           Double pixel = Double(nchan/2);
           Double refFreqNew = (pixel-crpix)*cdelt + crval;
@@ -227 +200 @@
           Vector<Complex> xpol;
           polConversion(specs, flags, xpol, ctable);
+          Vector<Float> tsys = tsysFromTable(ctable);
           // dummy data
-          uInt nPol = specs.ncolumns();
+          uInt npol = specs.ncolumn();
           Matrix<Float>   baseLin(npol,2, 0.0f);
           Matrix<Float>   baseSub(npol,9, 0.0f);
@@ -237 +211 @@
 
 
-          if (status = cWriter->write(scano, cycno, rec.asDouble("TIME"),
+          if (status = cWriter->write(scanno, cycno, rec.asDouble("TIME"),
                                       rec.asDouble("INTERVAL"),
                                       rec.asString("FIELDNAME"),
                                       rec.asString("SRCNAME"),
-                                      direction ,//
+                                      direction,
                                       srcPM, srcVel, // not in scantable yet
                                       ifno,
                                       refFreqNew, nchan*abs(cdelt), cdelt,
                                       restfreq,
-                                      tcal,//
-                                      tcaltime,//
+                                      tcal,
+                                      tcalt,
                                       rec.asFloat("AZIMUTH"),
                                       rec.asFloat("ELEVATION"),
                                       rec.asFloat("PARANGLE"),
                                       focusAxi, focusTan, focusRot,//
-                                      temperature,//
-                                      pressure, humidity, windSpeed, windAz,//
+                                      temperature,
+                                      pressure, humidity, windSpeed, windAz,
                                       rec.asInt("REFBEAM"), beamno,
-                                      direction,//
+                                      direction,
                                       scanRate,// not in scantable
-                                      tSys, //
+                                      tsys,
                                       sigma, calFctr,// not in scantable
                                       baseLin, baseSub,// not in scantable
@@ -288 +262 @@
 }
 
-void STWriter::polConversion( Matrix< Float >& specs, Matrix< Float >& flags,
+Vector<Float> STWriter::tsysFromTable(const Table& tab)
+{
+  ROArrayColumn<Float> tsysCol(tab, "TSYS");
+  Vector<Float> out(tab.nrow());
+  Vector<Float> tmp;
+  for (uInt i=0; i<tab.nrow(); ++i) {
+    tmp = tsysCol(i);
+    out[i] = tmp[0];
+  }
+}
+
+void STWriter::polConversion( Matrix< Float >& specs, Matrix< uChar >& flags,
                               Vector< Complex > & xpol, const Table & tab )
 {
@@ -297 +282 @@
     throw(AipsError("msg"));
   // use the first row to fill in all the "metadata"
-  const TableRecord& rec = row.record(0);
-  ROArrayColumn<Float> specCol(ctable, "SPECTRA");
-  ROArrayColumn<uChar> flagCol(ctable, "FLAGTRA");
+  const TableRecord& rec = row.get(0);
+  ROArrayColumn<Float> specCol(tab, "SPECTRA");
+  ROArrayColumn<uChar> flagCol(tab, "FLAGTRA");
   uInt nchan = specCol(0).nelements();
-  uInt ncols = ( ctable.nrow()==1 ? 1: 2 );
+  uInt ncols = (tab.nrow()==1 ? 1: 2 );
   specs.resize(nchan, ncols);
   flags.resize(nchan, ncols);
@@ -310 +295 @@
   }
   // now the complex if exists
-  Vector<Complex> xpol;
   Bool hasxpol = False;
   xpol.resize();
-  if ( ctable.nrow() == 4 ) {
+  if ( tab.nrow() == 4 ) {
     hasxpol = True;
     xpol.resize(nchan);
@@ -319 +303 @@
     reals = specCol(2); imags = specCol(3);
     for (uInt k=0; k < nchan; ++k) {
-  `   xpol[k] = Complex(reals[k], imags[k]);
+      xpol[k] = Complex(reals[k], imags[k]);
     }
   }
 }
+
+
+}

trunk/src/STWriter.h

@@ -37 +37 @@
 #include <casa/Utilities/CountedPtr.h>
 
-#include <SDMemTable.h>
-#include <SDMemTableWrapper.h>
-
-#include <SDLog.h>
+#include "SDLog.h"
+#include "Scantable.h"
 
 class PKSwriter;
+class casa::Table;
 
 namespace asap {
@@ -54 +53 @@
 // 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, casa::Bool toStokes);
+  casa::Int write(const casa::CountedPtr<Scantable> table,
+            const string &filename);
 
 private:
+  casa::Vector<casa::Float> tsysFromTable(const casa::Table& tab);
+
   void polConversion( casa::Matrix<casa::Float>& spec,
-                      casa::Matrix<casa::Float>& flag,
+                      casa::Matrix<casa::uChar>& flag,
                       casa::Vector<casa::Complex>& xpol,
-                      const Table& tab);
+                      const casa::Table& tab);
   std::string     cFormat;
   PKSwriter *cWriter;