Changeset 1779 for branches/mergetest/external/atnf/PKSIO/PKSSDwriter.cc

Timestamp:

07/29/10 19:13:46 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: No (test merging alma branch)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s):

Description:

Location:

branches/mergetest

Files:

• . (modified) (1 prop)
• external/atnf/PKSIO/PKSSDwriter.cc (modified) (13 diffs)

branches/mergetest/external/atnf/PKSIO/PKSSDwriter.cc

@@ -35 +35 @@
 #include <atnf/PKSIO/PKSSDwriter.h>
 
+#include <casa/Logging/LogIO.h>
+
 #include <casa/stdio.h>
 #include <casa/Quanta/MVTime.h>
@@ -41 +43 @@
 #include <cstring>
 
+// Class name
+const string className = "PKSSDwriter" ;
+
 //--------------------------------------------------- PKSSDwriter::PKSSDwriter
 
@@ -47 +52 @@
 PKSSDwriter::PKSSDwriter()
 {
-  // By default, messages are written to stderr.
-  initMsg();
 }
 
@@ -58 +61 @@
 {
   close();
-}
-
-//-------------------------------------------------------- PKSSDwriter::setMsg
-
-// Set message disposition.  If fd is non-zero messages will be written
-// to that file descriptor, else stored for retrieval by getMsg().
-
-Int PKSSDwriter::setMsg(FILE *fd)
-{
-  PKSmsg::setMsg(fd);
-  cSDwriter.setMsg(fd);
-
-  return 0;
 }
 
@@ -92 +82 @@
         const Bool   haveBase)
 {
-  // Clear the message stack.
-  clearMsg();
+  const string methodName = "create()" ;
+  LogIO os( LogOrigin( className, methodName, WHERE ) ) ;
 
   double antPos[3];
@@ -102 +92 @@
   cNIF = nChan.nelements();
   if (nPol.nelements() != cNIF || haveXPol.nelements() != cNIF) {
-    cerr << "PKSSDwriter::create: "
-         << "Inconsistent number of IFs for nChan, nPol, and/or haveXPol."
-         << endl;
+    os << LogIO::SEVERE << "Inconsistent number of IFs for nChan, nPol, and/or haveXPol." << LogIO::POST ;
     return 1;
   }
@@ -131 +119 @@
         (int *)cNPol.getStorage(deleteIt),
         (int *)cHaveXPol.getStorage(deleteIt), (int)cHaveBase, 1);
-  logMsg(cSDwriter.getMsg());
-  cSDwriter.clearMsg();
+  //logMsg(cSDwriter.getMsg());
+  //cSDwriter.clearMsg();
   if (status) {
     cSDwriter.deleteFile();
@@ -148 +136 @@
         const PKSrecord &pksrec)
 {
+  const string methodName = "write()" ;
+  LogIO os( LogOrigin( className, methodName, WHERE ) ) ;
+
   // Do basic checks.
   Int IFno = pksrec.IFno;
   uInt iIF = IFno - 1;
   if (IFno < 1 || Int(cNIF) < IFno) {
-    cerr << "PKSDwriter::write: "
-         << "Invalid IF number " << IFno
-         << " (maximum " << cNIF << ")." << endl;
+    os << LogIO::SEVERE 
+       << "Invalid IF number " << IFno
+       << " (maximum " << cNIF << ")." << LogIO::POST ;
     return 1;
   }
@@ -160 +151 @@
   uInt nChan = pksrec.spectra.nrow();
   if (nChan != cNChan(iIF)) {
-    cerr << "PKSDwriter::write: "
-         << "Wrong number of channels for IF " << IFno << "," << endl
-         << "                   "
+    os << LogIO::SEVERE << "Wrong number of channels for IF " << IFno << "," << endl
          << "got " << nChan << " should be " << cNChan(iIF) << "." << endl;
+    os << LogIO::POST ;
     return 1;
   }
@@ -169 +159 @@
   uInt nPol = pksrec.spectra.ncolumn();
   if (nPol != cNPol(iIF)) {
-    cerr << "PKSDwriter::write: "
-         << "Wrong number of polarizations for IF " << IFno << "," << endl
-         << "                   "
-         << "got " << nPol << " should be " << cNPol(iIF) << "." << endl;
+    os << LogIO::SEVERE << "Wrong number of polarizations for IF " << IFno << "," << endl
+       << "got " << nPol << " should be " << cNPol(iIF) << "." << endl;
+    os << LogIO::POST ;
     return 1;
   }
 
-  // Extract calendar information from mjd.
+  // Extract calendar information frrom mjd.
   MVTime time(pksrec.mjd);
   Int year  = time.year();
@@ -196 +185 @@
   mbrec.srcRA    = pksrec.srcDir(0);
   mbrec.srcDec   = pksrec.srcDir(1);
-
-  mbrec.restFreq = pksrec.restFreq;
-
+  if (pksrec.restFreq.shape()==0) { 
+     mbrec.restFreq = 0;
+  }
+  else {
+     mbrec.restFreq = pksrec.restFreq(0);
+  }
   strncpy(mbrec.obsType, (char *)pksrec.obsType.chars(), 16);
 
@@ -291 +283 @@
 
   Int status = cSDwriter.write(mbrec);
-  logMsg(cSDwriter.getMsg());
-  cSDwriter.clearMsg();
+  //logMsg(cSDwriter.getMsg());
+  //cSDwriter.clearMsg();
   if (status) {
     status = 1;
@@ -325 +317 @@
 {
   cSDwriter.close();
-  logMsg(cSDwriter.getMsg());
-  cSDwriter.clearMsg();
-}
+  //logMsg(cSDwriter.getMsg());
+  //cSDwriter.clearMsg();
+}