Changeset 192

Timestamp:

01/14/05 11:06:15 (19 years ago)

Author:

kil064

Message:

adjust to allow FITSImage writing (use SDFITSImageWriter)
delete pointer in destructor

Location:

trunk/src

Files:

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

trunk/src/SDWriter.cc

@@ -1 @@
-//#---------------------------------------------------------------------------
+ //#---------------------------------------------------------------------------
 //# SDWriter.cc: ASAP class to write out single dish spectra.
 //#---------------------------------------------------------------------------
@@ -43 +43 @@
 #include "SDMemTable.h"
 #include "SDWriter.h"
+#include "SDFITSImageWriter.h"
 
 using namespace casa;
@@ -54 +55 @@
 {
   cFormat = format;
-
+//
   if (cFormat == "MS2") {
     cWriter = new PKSMS2writer();
-  } else {
+  } else if (cFormat == "SDFITS") {
     cWriter = new PKSSDwriter();
+  } else if (cFormat == "FITS") {
+    cWriter = 0;
   }
 }
@@ -68 +71 @@
 SDWriter::~SDWriter()
 {
-  // Nothing.
+   if (cWriter) {
+     delete cWriter;
+   }
 }
 
@@ -75 +80 @@
 // Reset the output format.
 
-Int SDWriter::setFormat(
-        const std::string &format)
+Int SDWriter::setFormat(const std::string &format)
 {
   if (format != cFormat) {
-    delete cWriter;
-
+    if (cWriter) delete cWriter;
+//
     cFormat = format;
     if (cFormat == "MS2") {
       cWriter = new PKSMS2writer();
-    } else {
+    } else if (cFormat == "SDFITS") {
       cWriter = new PKSSDwriter();
+    } else if (cFormat == "FITS") {
+      cWriter = 0;
     }
   }
-
   return 0;
 }
@@ -97 +102 @@
 // finished.
 
-Int SDWriter::write(
-        const CountedPtr<SDMemTable> table,
-        const std::string &filename)
-{
+Int SDWriter::write(const CountedPtr<SDMemTable> table,
+                    const std::string &filename)
+{
+
+// Image FITS
+
+  if (cFormat=="FITS") {
+     Bool verbose = True;
+     SDFITSImageWriter iw;
+     if (iw.write(*table, filename, verbose)) {
+        return 0;
+     } else {
+        return 1;
+     }
+  } 
+
+// MS or SDFITS
+
   // Extract the header from the table.
   SDHeader hdr = table->getSDHeader();

trunk/src/SDWriter.h

@@ -49 +49 @@
   ~SDWriter();
 
+// Format can be "SDIFTS", "FITS", or "MS2"
   casa::Int setFormat(const string &format = "SDFITS");
   casa::Int write(const casa::CountedPtr<SDMemTable> table,