Changeset 717 for trunk/src/SDMemTable.cc

Timestamp:

11/17/05 14:37:54 (19 years ago)

Author:

mar637

Message:

implemented use of SDLog

File:

• trunk/src/SDMemTable.cc (modified) (7 diffs)

trunk/src/SDMemTable.cc

@@ -887 +887 @@
   MFrequency::Types mft;
   if (!MFrequency::getType(mft, rf)) {
-    cerr << "Frequency type unknown assuming TOPO" << endl;
+    ostringstream oss;
+    pushLog("WARNING: Frequency type unknown assuming TOPO");
     mft = MFrequency::TOPO;
   }
@@ -923 +924 @@
   if (!MFrequency::getType(mtype, frm)) {
     // Should never happen
-    cerr << "Frequency type unknown assuming TOPO" << endl;
+    pushLog("WARNING: Frequency type unknown assuming TOPO");
     mtype = MFrequency::TOPO;
   }
@@ -1655 +1656 @@
   if (!MDirection::getType(mdr, mp[eq])) {   
     mdr = MDirection::J2000;
-    cerr  << "Unknown equinox using J2000" << endl;
+    pushLog("WARNING: Unknown equinox using J2000");
+    
   }
 
@@ -1667 +1669 @@
   table_.keywordSet().get("Epoch",ep);
   if (!MEpoch::getType(met, ep)) {
-    cerr << "Epoch type unknown - using UTC" << endl;
+     pushLog("WARNING: Epoch type unknown - using UTC");
     met = MEpoch::UTC;
   }
@@ -1721 +1723 @@
    SDFrequencyTable sdft = getSDFreqTable();
 
+   ostringstream oss;
    if (nRestFreqs>1) {
      // Replace restFreqs, one per IF
-      if (nRestFreqs != nIFs) {
-         throw (AipsError("Number of rest frequencies must be equal to the number of IFs"));
-      }
-      cout << "Replacing rest frequencies, one per IF, with given list : " << restFreqs << endl;
-      sdft.deleteRestFrequencies();
-      for (uInt i=0; i<nRestFreqs; i++) {
-         Quantum<Double> rf(restFreqs[i], unit);
-         sdft.addRestFrequency(rf.getValue("Hz"));
-      }
+     if (nRestFreqs != nIFs) {
+       throw (AipsError("Number of rest frequencies must be equal to the number of IFs"));
+     }
+     ostringstream oss;
+     oss << "Replacing rest frequencies, one per IF, with given list : " << restFreqs;
+     sdft.deleteRestFrequencies();
+     for (uInt i=0; i<nRestFreqs; i++) {
+       Quantum<Double> rf(restFreqs[i], unit);
+       sdft.addRestFrequency(rf.getValue("Hz"));
+     }
    } else {
 
@@ -1738 +1742 @@
       idx = sdft.addRestFrequency(rf.getValue("Hz"));
       if (whichIF>=0) {
-         cout << "Selecting given rest frequency (" << restFreqs[0] << ") for IF " << whichIF << endl;
+         oss << "Selecting given rest frequency (" << restFreqs[0] << ") for IF " << whichIF << endl;
       } else {
-         cout << "Selecting given rest frequency (" << restFreqs[0] << ") for all IFs" << endl;
+         oss << "Selecting given rest frequency (" << restFreqs[0] << ") for all IFs" << endl;
       }
    }
-   
+   pushLog(String(oss));
    // Replace
    Bool empty = source.empty();
@@ -1778 +1782 @@
 }
 
-void SDMemTable::spectralLines() const
+std::string SDMemTable::spectralLines() const
 {
    Vector<String> lines = MeasTable::Lines();
    MFrequency lineFreq;
    Double freq;
-
-   cout.flags(std::ios_base::left);
-   cout << "Line      Frequency (Hz)" << endl;
-   cout << "-----------------------" << endl;
+   ostringstream oss;
+
+   oss.flags(std::ios_base::left);
+   oss << "Line      Frequency (Hz)" << endl;
+   oss << "-----------------------" << endl;
    for (uInt i=0; i<lines.nelements(); i++) {
      MeasTable::Line(lineFreq, lines[i]);
      freq = lineFreq.getValue().getValue();          // Hz
-     cout << setw(11) << lines[i] << setprecision(10) << freq << endl;
+     oss << setw(11) << lines[i] << setprecision(10) << freq << endl;
    }
+   return String(oss);
 }