Changeset 996 for trunk/src/STWriter.cpp

Timestamp:

04/06/06 13:45:58 (18 years ago)

Author:

mar637

Message:

more fixes after compiling with -Wall.

File:

• trunk/src/STWriter.cpp (modified) (5 diffs)

trunk/src/STWriter.cpp

@@ -141 +141 @@
   Int status;
   Bool havexpol = Bool(in->npol() > 2);
-  if (status = writer_->create(filename, hdr.observer, hdr.project,
+  status = writer_->create(filename, hdr.observer, hdr.project,
                                hdr.antennaname, hdr.antennaposition,
                                hdr.obstype, hdr.equinox, hdr.freqref,
-                               nChan, nPol, False, havexpol)) {
+                               nChan, nPol, False, havexpol);
+  if ( status ) {
     throw(AipsError("Failed to create output file"));
   }
@@ -214 +215 @@
           Vector<Float>   sigma(npol, 0.0f);
           Vector<Float>   calFctr(npol, 0.0f);
-          if (status = writer_->write(scanno, cycno, rec.asDouble("TIME"),
+          status = writer_->write(scanno, cycno, rec.asDouble("TIME"),
                                       rec.asDouble("INTERVAL"),
                                       rec.asString("FIELDNAME"),
@@ -239 +240 @@
                                       specs, flags,
                                       xCalFctr,//
-                                      xpol)
-                                      ) {
+                                      xpol);
+          if ( status ) {
             writer_->close();
             throw(AipsError("STWriter: Failed to export Scantable."));
@@ -281 +282 @@
                               Vector< Complex > & xpol, const Table & tab )
 {
-  TableRow row(tab);
   String poltype = tab.keywordSet().asString("POLTYPE");
   if ( poltype != "linear") {
@@ -287 +287 @@
     throw(AipsError(msg));
   }
-  // use the first row to fill in all the "metadata"
-  const TableRecord& rec = row.get(0);
   ROArrayColumn<Float> specCol(tab, "SPECTRA");
   ROArrayColumn<uChar> flagCol(tab, "FLAGTRA");