Changeset 1443 for trunk

Timestamp:

09/01/08 11:54:04 (16 years ago)

Author:

Malte Marquarding

Message:

Fix ticket #127; still have to add class header hack

Location:

trunk

Files:

• SConstruct (modified) (1 diff)
• python/scantable.py (modified) (1 diff)
• src/STFITSImageWriter.cpp (added)
• src/STFITSImageWriter.h (added)
• src/STWriter.cpp (modified) (4 diffs)

trunk/SConstruct

@@ -98 +98 @@
                                                "include", "casacore"))
     if not conf.CheckLib("casa_casa", language='c++'): Exit(1)
-    conf.env.PrependUnique(LIBS=["casa_ms", "casa_components", 
+    conf.env.PrependUnique(LIBS=["casa_images", "casa_ms", "casa_components", 
                                  "casa_coordinates", "casa_lattices", 
                                  "casa_fits", "casa_measures", "casa_scimath",

trunk/python/scantable.py

@@ -91 +91 @@
                                        'MS2' (saves as an aips++
                                               MeasurementSet V2)
+                                       'FITS' (save as image FITS - not 
+                                               readable by class)
+                                       'CLASS' (save as FITS readable by CLASS)
             overwrite:   If the file should be overwritten if it exists.
                          The default False is to return with warning

trunk/src/STWriter.cpp

@@ -47 +47 @@
 #include <tables/Tables/ArrayColumn.h>
 
-//#include "SDFITSImageWriter.h"
+#include "STFITSImageWriter.h"
 #include "STAsciiWriter.h"
 #include "STHeader.h"
@@ -58 +58 @@
 STWriter::STWriter(const std::string &format)
 {
+  format_ = format;
+  String t(format_);
+  t.upcase();
+  if (t == "MS2") {
+    writer_ = new PKSMS2writer();
+  } else if (t == "SDFITS") {
+    writer_ = new PKSSDwriter();
+  } else if (t == "ASCII" || t == "FITS" || t == "CLASS") {
+    writer_ = 0;
+  } else {
+    throw (AipsError("Unrecognized export format"));
+  }
+}
+
+STWriter::~STWriter()
+{
+   if (writer_) {
+     delete writer_;
+   }
+}
+
+Int STWriter::setFormat(const std::string &format)
+{
+  if (format != format_) {
+    if (writer_) delete writer_;
+  }
+
   format_ = format;
   String t(format_);
@@ -65 +92 @@
   } else if (t== "SDFITS") {
     writer_ = new PKSSDwriter();
-  } else if (t== "ASCII") {
-    writer_ = 0;
-  } else {
-    throw (AipsError("Unrecognized export format"));
-  }
-}
-
-STWriter::~STWriter()
-{
-   if (writer_) {
-     delete writer_;
-   }
-}
-
-Int STWriter::setFormat(const std::string &format)
-{
-  if (format != format_) {
-    if (writer_) delete writer_;
-  }
-
-  format_ = format;
-  String t(format_);
-  t.upcase();
-  if (t== "MS2") {
-    writer_ = new PKSMS2writer();
-  } else if (t== "SDFITS") {
-    writer_ = new PKSSDwriter();
-  } else if (t== "ASCII") {
+  } else if (t == "ASCII" || t == "FITS" || t == "CLASS") {
     writer_ = 0;
   } else {
@@ -110 +110 @@
     } else {
       return 1;
+    }
+  } else if ( format_ == "FITS" || format_ == "CLASS") {
+    STFITSImageWriter iw;
+    if (format_ == "CLASS") {
+      iw.setClass(True);
+    }
+    if (iw.write(*in, filename)) {
+      return 0;
     }
   }