Changeset 414 for trunk

Timestamp:

02/11/05 17:50:42 (20 years ago)

Author:

mar637

Message:

cerr to cout changes were appropriate.

Location:

trunk/src

Files:

• Makefile (modified) (1 diff)
• MathUtils.h (modified) (2 diffs)
• SDAsciiWriter.cc (modified) (1 diff)
• SDContainer.cc (modified) (1 diff)
• SDFITSImageWriter.cc (modified) (3 diffs)
• SDMath.cc (modified) (11 diffs)
• SDMemTable.cc (modified) (4 diffs)
• SDReader.cc (modified) (1 diff)

trunk/src/Makefile

@@ -8 +8 @@
 
 CXXFLAGS := -O -fPIC
-#CXXFLAGS += -fpermissive # This should be removed.
+
 #CXXFLAGS += -ansi
 CXXFLAGS += -pedantic -Wno-long-long

trunk/src/MathUtils.h

@@ -39 +39 @@
 // Add new entry to list
 template <class T>
-casa::uInt addEntry (casa::Vector<T>& list, T val);
+casa::uInt addEntry(casa::Vector<T>& list, T val);
 
 // Find the scan boundaries from a list of ScanIDs
@@ -53 +53 @@
 
 // Generate specified statistic
-float statistics (const casa::String& which,  const casa::MaskedArray<casa::Float>& data);
+float statistics(const casa::String& which,  
+                 const casa::MaskedArray<casa::Float>& data);
 
 // Replace masked value by zero
-void replaceMaskByZero (casa::Vector<casa::Float>& data, const casa::Vector<casa::Bool>& mask);
+void replaceMaskByZero(casa::Vector<casa::Float>& data, 
+                        const casa::Vector<casa::Bool>& mask);
 };
 

trunk/src/SDAsciiWriter.cc

@@ -175 +175 @@
 //
    of.close();
-   cerr << "Wrote " << nRows << " rows into file " << fileName << endl;
+   cout << "Wrote " << nRows << " rows into file " << fileName << endl;
 //   
    return True;

trunk/src/SDContainer.cc

@@ -520 +520 @@
       cerr << "Source    ID" << endl;   
       for (uInt i=0; i<n_; i++) {
-         cerr << setw(11) << source_(i) << ID_(i) << endl;
+         cout << setw(11) << source_(i) << ID_(i) << endl;
       }
    }

trunk/src/SDFITSImageWriter.cc

@@ -117 +117 @@
    Directory dir(dirName2);
    dir.create(True);
-   cerr << "Created directory '" << dirName2 << "' for output files" << endl;
+   cout << "Created directory '" << dirName2 << "' for output files" << endl;
 
 // Temps
@@ -229 +229 @@
          String tS(oss);
          String fileName = dirName2 + String("/") + tS;
-         if (verbose) cerr << "Writing row " << iRow 
+         if (verbose) cout << "Writing row " << iRow 
                            << " into file '" << tS << "'" << endl;
 //
@@ -249 +249 @@
 //
    if (!verbose) {
-      cerr << "Wrote " << nRows << " into individual FITS files" << endl;
+      cout << "Wrote " << nRows << " into individual FITS files" << endl;
    }
 //   

trunk/src/SDMath.cc

@@ -1089 +1089 @@
   Double cFac = 1.0;    
   if (fluxUnit==JY) {
-     cerr << "Converting to K" << endl;
+     cout << "Converting to K" << endl;
 //
      Quantum<Double> t(1.0,fluxUnit);
@@ -1098 +1098 @@
      sh.fluxunit = "K";
   } else if (fluxUnit==K) {
-     cerr << "Converting to Jy" << endl;
+     cout << "Converting to Jy" << endl;
 //
      Quantum<Double> t(1.0,fluxUnit);
@@ -1121 +1121 @@
      if (toKelvin) factor = 1.0 / JyPerK;
 //
-     cerr << "Applying supplied conversion factor = " << factor << endl;
+     cout << "Applying supplied conversion factor = " << factor << endl;
      Vector<Float> factors(in.nRow(), factor);
      correctFromVector (pTabOut, in, doAll, factors);
@@ -1130 +1130 @@
      }
 //
-     cerr << "Applying supplied conversion factor = " << factor << endl;
+     cout << "Applying supplied conversion factor = " << factor << endl;
      Vector<Float> factors(in.nRow(), factor);
      correctFromVector (pTabOut, in, doAll, factors);
@@ -1140 +1140 @@
 // change per integration.
 
-     cerr << "Looking up conversion factors" << endl;
+     cout << "Looking up conversion factors" << endl;
      convertBrightnessUnits (pTabOut, in, toKelvin, cFac, doAll);
   }
@@ -1204 +1204 @@
      }
 //
-     cerr << "Making polynomial correction with " << msg << " coefficients" << endl;
+     cout << "Making polynomial correction with " << msg << " coefficients" << endl;
      const uInt nRow = in.nRow();
      Vector<Float> factor(nRow);
@@ -1222 +1222 @@
 // Read and correct
 
-     cerr << "Making correction from ascii Table" << endl;
+     cout << "Making correction from ascii Table" << endl;
      correctFromAsciiTable (pTabOut, in, fileName, col0, col1, 
                             methodStr, doAll, x);
@@ -1301 +1301 @@
 //
    Vector<Float> JyPerK = sdAtt.JyPerK(inst, dateObs, freqs);
-   cerr << "Jy/K = " << JyPerK << endl;
+   cout << "Jy/K = " << JyPerK << endl;
    Vector<Float> factors = cFac * JyPerK;
    if (toKelvin) factors = Float(1.0) / factors;
@@ -1405 +1405 @@
       refEpoch = in.getEpoch(0);
    }
-   cerr << "Aligning at reference Epoch " << formatEpoch(refEpoch) << 
-           " in frame " << MFrequency::showType(freqSystem) << endl;
-
+   cout << "Aligning at reference Epoch " << formatEpoch(refEpoch) 
+        << " in frame " << MFrequency::showType(freqSystem) << endl;
+   
 // Get Reference Position
 
@@ -1452 +1452 @@
 // New output Table
 
-   cerr << "Create output table" << endl;
+   cout << "Create output table" << endl;
    SDMemTable* pTabOut = new SDMemTable(in,True);
    pTabOut->putSDFreqTable(freqTabOut);
@@ -1471 +1471 @@
    for (uInt iRow=0; iRow<nRows; ++iRow) {
       if (iRow%10==0) {
-         cerr << "Processing row " << iRow << endl;
+         cout << "Processing row " << iRow << endl;
       }
 

trunk/src/SDMemTable.cc

@@ -1381 +1381 @@
          throw (AipsError("Number of rest frequencies must be equal to the number of IFs"));
       }
-      cerr << "Replacing rest frequencies with given list, one per IF" << endl;
+      cout << "Replacing rest frequencies with given list, one per IF" << endl;
 //
       sdft.deleteRestFrequencies();
@@ -1394 +1394 @@
       Quantum<Double> rf(restFreqs[0], unit);
       idx = sdft.addRestFrequency(rf.getValue("Hz"));
-      cerr << "Selecting given rest frequency" << endl;
+      cout << "Selecting given rest frequency" << endl;
    }
 
@@ -1438 +1438 @@
 }
 
-void SDMemTable::spectralLines () const
+void SDMemTable::spectralLines() const
 {
    Vector<String> lines = MeasTable::Lines();
@@ -1444 +1444 @@
    Double freq;
 //
-   cerr.flags(std::ios_base::left);
-   cerr << "Line      Frequency (Hz)" << endl;
-   cerr << "-----------------------" << endl;
+   cout.flags(std::ios_base::left);
+   cout << "Line      Frequency (Hz)" << endl;
+   cout << "-----------------------" << endl;
    for (uInt i=0; i<lines.nelements(); i++) {
      MeasTable::Line(lineFreq, lines[i]);
      freq = lineFreq.getValue().getValue();          // Hz
 //
-     cerr << setw(11) << lines[i] << setprecision(10) << freq << endl;
+     cout << setw(11) << lines[i] << setprecision(10) << freq << endl;
    }
 }

trunk/src/SDReader.cc

@@ -219 +219 @@
   Vector<Complex> xPol;
   uInt n = seq.size();
+
 
   uInt stepsize = header_->nif*header_->nbeam;