Changeset 716 for trunk/src/SDMath.cc

Timestamp:

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

Author:

mar637

Message:

added frequency switching; implemented use of SDLog

File:

• trunk/src/SDMath.cc (modified) (44 diffs)

trunk/src/SDMath.cc

@@ -31 +31 @@
 #include <vector>
 
+
 #include <casa/aips.h>
 #include <casa/iostream.h>
+#include <casa/sstream.h>
 #include <casa/iomanip.h>
 #include <casa/BasicSL/String.h>
@@ -89 +91 @@
 
 SDMath::SDMath()
-{;}
+{
+}
 
 SDMath::SDMath(const SDMath& other)
@@ -113 +116 @@
                                        const String& refTime, 
                                        const String& method, 
-                                       Bool perFreqID) const
+                                       Bool perFreqID)
 {
   // Get frame info from Table
@@ -136 +139 @@
 SDMath::average(const std::vector<CountedPtr<SDMemTable> >& in,
                 const Vector<Bool>& mask, Bool scanAv,
-                const String& weightStr, Bool alignFreq) const
+                const String& weightStr, Bool alignFreq)
 // Weighted averaging of spectra from one or more Tables.
 {
@@ -365 +368 @@
 SDMath::binaryOperate(const CountedPtr<SDMemTable>& left,
                       const CountedPtr<SDMemTable>& right,
-                      const String& op, Bool preserve, Bool doTSys) const
+                      const String& op, Bool preserve, Bool doTSys)
 {
 
@@ -509 +512 @@
   IPosition start, end;
   Bool doAll = False;
-  setCursorSlice (start, end, doAll, *in);
+  setCursorSlice(start, end, doAll, *in);
 
 // Loop over rows
@@ -554 +557 @@
 
 
-SDMemTable* SDMath::bin(const SDMemTable& in, Int width) const
+SDMemTable* SDMath::bin(const SDMemTable& in, Int width)
 {
   SDHeader sh = in.getSDHeader();
@@ -615 +618 @@
 
 SDMemTable* SDMath::resample(const SDMemTable& in, const String& methodStr,
-                             Float width) const
+                             Float width)
 //
 // Should add the possibility of width being specified in km/s. This means
@@ -729 +732 @@
 
 SDMemTable* SDMath::unaryOperate(const SDMemTable& in, Float val, Bool doAll,
-                                 uInt what, Bool doTSys) const
+                                 uInt what, Bool doTSys)
 //
 // what = 0   Multiply
@@ -776 +779 @@
 
 SDMemTable* SDMath::averagePol(const SDMemTable& in, const Vector<Bool>& mask,
-                               const String& weightStr) const
+                               const String& weightStr)
 //
 // Average all polarizations together, weighted by variance
@@ -973 +976 @@
 SDMemTable* SDMath::smooth(const SDMemTable& in, 
                            const casa::String& kernelType,
-                           casa::Float width, Bool doAll) const
+                           casa::Float width, Bool doAll)
 //
 // Should smooth TSys as well
@@ -1047 +1050 @@
 
 SDMemTable* SDMath::convertFlux(const SDMemTable& in, Float D, Float etaAp, 
-                                Float JyPerK, Bool doAll) const
+                                Float JyPerK, Bool doAll)
 // 
 // etaAp = aperture efficiency (-1 means find)
@@ -1066 +1069 @@
   Bool toKelvin = True;
   Double cFac = 1.0;    
+
   if (fluxUnit==JY) {
-    cout << "Converting to K" << endl;
-    
+    pushLog("Converting to K");
     Quantum<Double> t(1.0,fluxUnit);
     Quantum<Double> t2 = t.get(JY);
@@ -1076 +1079 @@
     sh.fluxunit = "K";
   } else if (fluxUnit==K) {
-    cout << "Converting to Jy" << endl;
-    
+    pushLog("Converting to Jy");
     Quantum<Double> t(1.0,fluxUnit);
     Quantum<Double> t2 = t.get(K);
@@ -1087 +1089 @@
     throw(AipsError("Unrecognized brightness units in Table - must be consistent with Jy or K"));
   }
+
   pTabOut->putSDHeader(sh);
   
@@ -1096 +1099 @@
     factor *= JyPerK;
     if (toKelvin) factor = 1.0 / JyPerK;
-    cout << "Jy/K = " << JyPerK << endl;
+    ostringstream oss;
+    oss << "Jy/K = " << JyPerK;
+    pushLog(String(oss));
     Vector<Float> factors(in.nRow(), factor);
     scaleByVector(pTabOut, in, doAll, factors, False);
   } else if (etaAp>0.0) {
     Bool throwIt = True;
-    Instrument inst = SDAttr::convertInstrument (sh.antennaname, throwIt);
+    Instrument inst = SDAttr::convertInstrument(sh.antennaname, throwIt);
     SDAttr sda;
     if (D < 0) D = sda.diameter(inst);
-    Float JyPerK = SDAttr::findJyPerK (etaAp,D);
-    cout << "Jy/K = " << JyPerK << endl;
+    Float JyPerK = SDAttr::findJyPerK(etaAp,D);
+    ostringstream oss;
+    oss << "Jy/K = " << JyPerK;
+    pushLog(String(oss));
     factor *= JyPerK;
     if (toKelvin) {
@@ -1120 +1127 @@
     // change per integration.
     
-    cout << "Looking up conversion factors" << endl;
+    pushLog("Looking up conversion factors");
     convertBrightnessUnits (pTabOut, in, toKelvin, cFac, doAll);
   }
-
   return pTabOut;
 }
@@ -1131 +1137 @@
                                   const Vector<Float>& coeffs,
                                   const String& fileName,
-                                  const String& methodStr, Bool doAll) const
+                                  const String& methodStr, Bool doAll)
 {
 
@@ -1176 +1182 @@
        throw(AipsError("There is no known gain-elevation polynomial known for this instrument"));
      }
-     cout << "Making polynomial correction with " << msg << " coefficients" << endl;
+     pushLog("Making polynomial correction with "+msg+" coefficients");
      const uInt nRow = in.nRow();
      Vector<Float> factor(nRow);
@@ -1193 +1199 @@
     // Read and correct
     
-    cout << "Making correction from ascii Table" << endl;
+    pushLog("Making correction from ascii Table");
     scaleFromAsciiTable (pTabOut, in, fileName, col0, col1, 
                          methodStr, doAll, x, True);
@@ -1202 +1208 @@
  
 
-SDMemTable* SDMath::opacity(const SDMemTable& in, Float tau, Bool doAll) const
+SDMemTable* SDMath::opacity(const SDMemTable& in, Float tau, Bool doAll)
 {
 
@@ -1245 +1251 @@
 
    SDHeader sh = in.getSDHeader();
-   Instrument inst = SDAttr::convertInstrument (sh.antennaname, False);
+   Instrument inst = SDAttr::convertInstrument(sh.antennaname, False);
    SDAttr sdAtt;
    if (sdAtt.feedPolType(inst) != LINEAR) {
@@ -1299 +1305 @@
 //
    SDHeader sh = in.getSDHeader();
-   Instrument inst = SDAttr::convertInstrument (sh.antennaname, False);
+   Instrument inst = SDAttr::convertInstrument(sh.antennaname, False);
    SDAttr sdAtt;
    if (sdAtt.feedPolType(inst) != LINEAR) {
@@ -1378 +1384 @@
 
 void SDMath::convertBrightnessUnits (SDMemTable* pTabOut, const SDMemTable& in, 
-                                     Bool toKelvin, Float cFac, Bool doAll) const
+                                     Bool toKelvin, Float cFac, Bool doAll)
 {
 
@@ -1389 +1395 @@
 
    Bool throwIt = True;
-   Instrument inst = SDAttr::convertInstrument (sh.antennaname, throwIt);
+   Instrument inst = SDAttr::convertInstrument(sh.antennaname, throwIt);
 
 // Get Diameter (m)
 
    SDAttr sdAtt;
-
 // Get epoch of first row
 
@@ -1410 +1415 @@
 //
    Vector<Float> JyPerK = sdAtt.JyPerK(inst, dateObs, freqs);
-   cout << "Jy/K = " << JyPerK << endl;
+   ostringstream oss;
+   oss << "Jy/K = " << JyPerK;
+   pushLog(String(oss));
    Vector<Float> factors = cFac * JyPerK;
    if (toKelvin) factors = Float(1.0) / factors;
@@ -1474 +1481 @@
                                    const String& refTime, 
                                    const String& methodStr,
-                                   Bool perFreqID) const
+                                   Bool perFreqID)
 {
 // Get Header
@@ -1511 +1518 @@
      refEpoch = in.getEpoch(0);
    }
-   cout << "Aligning at reference Epoch " << formatEpoch(refEpoch) 
-        << " in frame " << MFrequency::showType(freqSystem) << endl;
+   pushLog("Aligning at reference Epoch "+formatEpoch(refEpoch) 
+                  +" in frame "+MFrequency::showType(freqSystem));
    
    // Get Reference Position
@@ -1561 +1568 @@
    // New output Table
    
-   cout << "Create output table" << endl;
+   pushLog("Create output table");
    SDMemTable* pTabOut = new SDMemTable(in,True);
    pTabOut->putSDFreqTable(freqTabOut);
@@ -1580 +1587 @@
    for (uInt iRow=0; iRow<nRows; ++iRow) {
      if (iRow%10==0) {
-       cout << "Processing row " << iRow << endl;
+       pushLog("Processing row "+iRow);
      }
      
@@ -1688 +1695 @@
 
 
-SDMemTable* SDMath::frequencySwitch(const SDMemTable& in) const
+SDMemTable* SDMath::frequencySwitch(const SDMemTable& in)
 {
   if (in.nIF() != 2) {
@@ -1748 +1755 @@
                      Int scanID, Double timeStamp,
                      Double interval, const String& sourceName,
-                     const Vector<uInt>& freqID) const
+                     const Vector<uInt>& freqID)
 {
 // Data and mask
@@ -1777 +1784 @@
                         uInt iTab, uInt iRow, uInt axis, 
                         uInt nAxesSub, Bool useMask,
-                        WeightType wtType) const
+                        WeightType wtType)
 {
 
@@ -1886 +1893 @@
                        Double intSum,
                        WeightType wtType, Int axis,
-                       Int nAxesSub) const
+                       Int nAxesSub)
 {
    IPosition pos2(nAxesSub,0);
@@ -1964 +1971 @@
 
 void SDMath::convertWeightString(WeightType& wtType, const String& weightStr,
-                                 Bool listType) const
+                                 Bool listType)
 {
   String tStr(weightStr);
@@ -1989 +1996 @@
   }
 //
-  if (listType) cout << msg << endl;
+  if (listType) pushLog(msg);
 }
 
 
 void SDMath::convertInterpString(casa::InterpolateArray1D<Double,Float>::InterpolationMethod& type,  
-                                 const casa::String& interp) const
+                                 const casa::String& interp)
 {
   String tStr(interp);
@@ -2012 +2019 @@
 
 void SDMath::putDataInSDC(SDContainer& sc, const Array<Float>& data,
-                          const Array<Bool>& mask) const
+                          const Array<Bool>& mask)
 {
     sc.putSpectrum(data);
@@ -2021 +2028 @@
 }
 
-Table SDMath::readAsciiFile (const String& fileName) const
+Table SDMath::readAsciiFile(const String& fileName) const
 {
    String formatString;
@@ -2034 +2041 @@
                                  const String& col0, const String& col1,
                                  const String& methodStr, Bool doAll,
-                                 const Vector<Float>& xOut, Bool doTSys) const
+                                 const Vector<Float>& xOut, Bool doTSys)
 {
 
@@ -2048 +2055 @@
                             const String& col1,
                             const String& methodStr, Bool doAll,
-                            const Vector<Float>& xOut, Bool doTsys) const
+                            const Vector<Float>& xOut, Bool doTsys)
 {
 
@@ -2078 +2085 @@
 void SDMath::scaleByVector(SDMemTable* pTabOut, const SDMemTable& in, 
                            Bool doAll, const Vector<Float>& factor,
-                           Bool doTSys) const
+                           Bool doTSys)
 {
 
@@ -2131 +2138 @@
                                     const ROScalarColumn<String>& srcCol,
                                     const ROArrayColumn<uInt>& fqIDCol,
-                                    Bool perFreqID) const
+                                    Bool perFreqID)
 {
    const uInt nRows = tabIn.nrow();
@@ -2165 +2172 @@
 
 
-MEpoch SDMath::epochFromString(const String& str, MEpoch::Types timeRef) const
+MEpoch SDMath::epochFromString(const String& str, MEpoch::Types timeRef)
 {
    Quantum<Double> qt;
@@ -2192 +2199 @@
                                        const MPosition& refPos,
                                        const MEpoch& refEpoch,
-                                       Bool perFreqID) const
+                                       Bool perFreqID)
 {
    for (uInt i=0; i<dDesc.length(); i++) {