Changeset 209 for trunk/src/SDAsciiWriter.cc

Timestamp:

01/18/05 17:31:59 (19 years ago)

Author:

mar637

Message:

• now using asap::AxisNo? enum instead of fixed axis indeces

File:

• trunk/src/SDAsciiWriter.cc (modified) (10 diffs)

trunk/src/SDAsciiWriter.cc

@@ -30 +30 @@
 //#---------------------------------------------------------------------------
 
-#include "SDAsciiWriter.h"
-
 #include <casa/aips.h>
 #include <casa/Arrays/Array.h>
@@ -40 +38 @@
 #include <casa/Quanta/MVAngle.h>
 
+
+#include <casa/iostream.h>
+#include <casa/fstream.h>
+
 #include <coordinates/Coordinates/CoordinateUtil.h>
 #include <coordinates/Coordinates/SpectralCoordinate.h>
@@ -51 +53 @@
 #include <tables/Tables/ArrayColumn.h>
 
+#include "Definitions.h"
 #include "SDContainer.h"
 #include "SDMemTable.h"
-
-#include <casa/iostream.h>
-#include <casa/fstream.h>
-
+#include "SDAsciiWriter.h"
 
 using namespace casa;
@@ -69 +69 @@
 
 
-Bool SDAsciiWriter::write(const SDMemTable& sdTable,  const String& fileName)
+Bool SDAsciiWriter::write(const SDMemTable& sdTable, const String& fileName)
 {
 
@@ -86 +86 @@
    ROScalarColumn<String> src(tab, "SRCNAME");
 
-// Axes (should be in header)
-
-   const uInt beamAxis = 0;
-   const uInt ifAxis = 1;
-   const uInt polAxis = 2;
-   const uInt chanAxis = 3;
-
 // Temps
 
@@ -109 +102 @@
 // Write header
 
-   of << "row beam IF pol source longitude latitude time nchan spectrum mask" << endl;
-
+   of << "row beam IF pol source longitude latitude time nchan spectrum mask" 
+      << endl;
+   
 // Loop over rows
 
@@ -131 +125 @@
 // Iterate through data in this row by spectra
 
-      ReadOnlyVectorIterator<Float> itData(values, chanAxis);
-      ReadOnlyVectorIterator<Bool> itMask(mask, chanAxis);
+      ReadOnlyVectorIterator<Float> itData(values, asap::ChanAxis);
+      ReadOnlyVectorIterator<Bool> itMask(mask, asap::ChanAxis);
       while (!itData.pastEnd()) {
          const IPosition& pos = itData.pos();
@@ -144 +138 @@
  
          dir.get(iRow, whichDir);
-         posDir(0) = pos(beamAxis);
+         posDir(0) = pos(asap::BeamAxis);
          posDir(1) = 0;
          lonLat[0] = whichDir(posDir);
 //
-         posDir(0) = pos(beamAxis);
+         posDir(0) = pos(asap::BeamAxis);
          posDir(1) = 1;
          lonLat[1] = whichDir(posDir);
 
-// Write.  This formats the vectors as [,,,,]  which we probably don't want.
-
-         of << iRow << "  " << pos(beamAxis) << " " <<  pos(ifAxis) << " " << pos(polAxis) << " " <<
-               src(iRow) <<  " " << formatDirection(lonLat) << " " << dTmp << " " << 
-               itData.vector().nelements() << " " << itData.vector() << "  " << itMask.vector() << endl;
+         // Write.  This formats the vectors as [,,,,] which we
+         // probably don't want.
+         uInt ba = uInt(asap::BeamAxis);
+         uInt ia = uInt(asap::IFAxis);
+         uInt pa = uInt(asap::PolAxis);
+
+         of << iRow << "  " << pos(ba) << " " 
+            << pos(ia) << " " << pos(pa) << " "
+            << src(iRow) <<  " " << formatDirection(lonLat) << " " 
+            << dTmp << " " 
+            << itData.vector().nelements() << " " << itData.vector() 
+            << "  " << itMask.vector() << endl;
 
 // Next spectrum
@@ -172 +173 @@
 
 
-Int SDAsciiWriter::convertStokes (Int val)
+Int SDAsciiWriter::convertStokes(Int val)
 {
    Stokes::StokesTypes stokes = Stokes::RR;
@@ -191 +192 @@
 
 
-String SDAsciiWriter::formatDirection (const Vector<Double>& lonLat)
+String SDAsciiWriter::formatDirection(const Vector<Double>& lonLat)
 { 
    MVAngle x1(lonLat(0));