Changeset 2657 for trunk/src

Timestamp:

10/10/12 12:17:12 (12 years ago)

Author:

Malte Marquarding

Message:

Ticket #280: Use FITSSpectralUtil::specsysFromFrame to write correct FITS output frame

Location:

trunk/src

Files:

• STFiller.cpp (modified) (3 diffs)
• STWriter.cpp (modified) (7 diffs)

trunk/src/STFiller.cpp

@@ -36 +36 @@
 #include <atnf/PKSIO/NROReader.h>
 #include <casa/Logging/LogIO.h>
+#include <fits/FITS/FITSSpectralUtil.h>
 
 #include <time.h>
@@ -226 +227 @@
   Vector<Int> start(nIF_, 1);
   Vector<Int> end(nIF_, 0);
-  reader_->select(beams, ifs, start, end, ref, True, haveXPol_[0], False, getPt);
+  reader_->select(beams, ifs, start, end, ref, True, haveXPol_[0], False, 
+                  getPt);
   table_->setHeader(*header_);
   //For MS, add the location of POINTING of the input MS so one get
@@ -249 +251 @@
   //MS style (as PKSMS2reader converts the original frame
   //in FITS standard style)
-  if (freqFrame == "TOPOCENT") {
-    freqFrame = "TOPO";
-  } else if (freqFrame == "GEOCENER") {
-    freqFrame = "GEO";
-  } else if (freqFrame == "BARYCENT") {
-    freqFrame = "BARY";
-  } else if (freqFrame == "GALACTOC") {
-    freqFrame = "GALACTO";
-  } else if (freqFrame == "LOCALGRP") {
-    freqFrame = "LGROUP";
-  } else if (freqFrame == "CMBDIPOL") {
-    freqFrame = "CMB";
-  } else if (freqFrame == "SOURCE") {
-    freqFrame = "REST";
-  }
+  MFrequency::Types fframe;
+  FITSSpectralUtil::frameFromSpecsys(fframe, freqFrame);
   // set both "FRAME" and "BASEFRAME"
-  table_->frequencies().setFrame(freqFrame, false);
-  table_->frequencies().setFrame(freqFrame,true);
+  table_->frequencies().setFrame(fframe, false);
+  table_->frequencies().setFrame(fframe,true);
+  
   //table_->focus().setParallactify(true);
 }

trunk/src/STWriter.cpp

@@ -40 +40 @@
 
 #include <atnf/PKSIO/PKSrecord.h>
-#ifndef NOPKSMS
-#include <atnf/PKSIO/PKSMS2writer.h>
-#endif
 #include <atnf/PKSIO/PKSSDwriter.h>
 #include <atnf/PKSIO/SrcType.h>
@@ -51 +48 @@
 #include <tables/Tables/ArrayColumn.h>
 
+#include <fits/FITS/FITSSpectralUtil.h>
+
 #include "STFITSImageWriter.h"
 #include "STAsciiWriter.h"
@@ -68 +67 @@
   t.upcase();
   if (t == "MS2") {
-    #ifdef NOPKSMS
     throw (AipsError("MS2 OUTPUT FORMAT IS NO LONGER SUPPORTED"));
-    #else
-    writer_ = new PKSMS2writer();
-    #endif
   } else if (t == "SDFITS") {
     writer_ = new PKSSDwriter();
@@ -99 +94 @@
   t.upcase();
   if (t== "MS2") {
-    #ifdef NOPKSMS
     throw (AipsError("MS2 OUTPUT FORMAT IS NO LONGER SUPPORTED"));
-    #else
-    writer_ = new PKSMS2writer();
-    #endif
   } else if (t== "SDFITS") {
     writer_ = new PKSSDwriter();
@@ -121 +112 @@
   // in asap on-the-fly.
 
+  String freqframe;
+  FITSSpectralUtil::specsysFromFrame(freqframe, 
+                                     in->frequencies().getFrame(true));
   CountedPtr<Scantable> inst = in;
   if (in->frequencies().getFrame(true) != in->frequencies().getFrame(false)) {
+    FITSSpectralUtil::specsysFromFrame(freqframe, 
+                                     in->frequencies().getFrame(false));
+  
     STMath stm(false);
     inst = stm.frequencyAlign(in);
@@ -151 +148 @@
   // before. Need to check with the Offline User Test data
   STHeader hdr = inst->getHeader();
-  //const Int nPol  = hdr.npol;
-  //const Int nChan = hdr.nchan;
   std::vector<uint> ifs = inst->getIFNos();
   int nIF = inst->nif();//ifs.size();
@@ -177 +172 @@
   // Create the output file and write static data.
   Int status;
-//   status = writer_->create(String(filename), hdr.observer, hdr.project,
-//                            hdr.antennaname, hdr.antennaposition,
-//                            hdr.obstype, hdr.fluxunit,
-//                            hdr.equinox, hdr.freqref,
-//                            nChan, nPol, havexpol, False);
   status = writer_->create(String(filename), hdr.observer, hdr.project,
                            inst->getAntennaName(), hdr.antennaposition,
                            hdr.obstype, hdr.fluxunit,
-                           hdr.equinox, hdr.freqref,
+                           hdr.equinox, freqframe,
                            nChan, nPol, havexpol, False);
   if ( status ) {