Changeset 1280 for trunk/src

Timestamp:

11/03/06 16:08:22 (18 years ago)

Author:

mar637

Message:

Merge from Release2.1.1b tag

File:

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

trunk/src/STWriter.cpp

@@ -65 +65 @@
   } else if (t== "SDFITS") {
     writer_ = new PKSSDwriter();
-  } else if (t== "FITS") {
-    writer_ = 0;
   } else if (t== "ASCII") {
     writer_ = 0;
@@ -94 +92 @@
   } else if (t== "SDFITS") {
     writer_ = new PKSSDwriter();
-  } else if (t== "FITS") {
-    writer_ = 0;
   } else if (t== "ASCII") {
     writer_ = 0;
@@ -108 +104 @@
 {
 
-// Image FITS
-
-  if (format_=="FITS") {
-//      Bool verbose = True;
-//      SDFITSImageWriter iw;
-//      if (iw.write(*in, filename, verbose)) {
-//         return 0;
-//      } else {
-//         return 1;
-//      }
-  } else if (format_=="ASCII") {
-     STAsciiWriter iw;
-     if (iw.write(*in, filename)) {
-        return 0;
-     } else {
-        return 1;
-     }
+  if (format_=="ASCII") {
+    STAsciiWriter iw;
+    if (iw.write(*in, filename)) {
+      return 0;
+    } else {
+      return 1;
+    }
   }
 
@@ -143 +129 @@
 
   const Table table = in->table();
-//   ROArrayColumn<uInt> freqIDCol(table, "FREQ_ID");
-//   Vector<uInt> freqIDs;
 
   // Create the output file and write static data.
   Int status;
-  //Bool havexpol = Bool(in->npol() > 2);
   status = writer_->create(String(filename), hdr.observer, hdr.project,
                                hdr.antennaname, hdr.antennaposition,