Changeset 185 for trunk/src

Timestamp:

01/10/05 17:00:45 (20 years ago)

Author:

mar637

Message:

cosmetics

File:

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

trunk/src/SDMath.cc

@@ -71 +71 @@
 {;}
 
-SDMath::SDMath (const SDMath& other)
+SDMath::SDMath(const SDMath& other)
 {
 
@@ -90 +90 @@
 
 
-CountedPtr<SDMemTable> SDMath::average (const Block<CountedPtr<SDMemTable> >& in,
-                                        const Vector<Bool>& mask, Bool scanAv,
-                                        const std::string& weightStr)
+CountedPtr<SDMemTable> SDMath::average(const Block<CountedPtr<SDMemTable> >& in,
+                                       const Vector<Bool>& mask, Bool scanAv,
+                                       const std::string& weightStr)
 //
 // Weighted averaging of spectra from one or more Tables.
@@ -101 +101 @@
   
   WeightType wtType = NONE;
-  convertWeightString (wtType, weightStr);
+  convertWeightString(wtType, weightStr);
 
 // Create output Table by cloning from the first table
@@ -251 +251 @@
 // Normalize data in 'sum' accumulation array according to weighting scheme
 
-           normalize (sum, sumSq, nPts, wtType, axis, nAxesSub);
+           normalize(sum, sumSq, nPts, wtType, axis, nAxesSub);
 
 // Fill scan container. The source and freqID come from the
@@ -258 +258 @@
 
            Float nR(nAccum);
-           fillSDC (sc, sum.getMask(), sum.getArray(), tSysSum/nR, outScanID,
+           fillSDC(sc, sum.getMask(), sum.getArray(), tSysSum/nR, outScanID,
                     timeSum/nR, intSum, sourceNameStart, freqIDStart);
 
@@ -290 +290 @@
 // Accumulate
 
-        accumulate (timeSum, intSum, nAccum, sum, sumSq, nPts, tSysSum, 
+        accumulate(timeSum, intSum, nAccum, sum, sumSq, nPts, tSysSum, 
                     tSys, nInc, mask, time, interval, in, iTab, iRow, axis, 
                     nAxesSub, useMask, wtType);
@@ -305 +305 @@
 //
 // Normalize data in 'sum' accumulation array according to weighting scheme
-  normalize (sum, sumSq, nPts, wtType, axis, nAxesSub);
+  normalize(sum, sumSq, nPts, wtType, axis, nAxesSub);
 
 // Create and fill container.  The container we clone will be from
@@ -313 +313 @@
   Float nR(nAccum);
   SDContainer sc = in[tableStart]->getSDContainer(rowStart);
-  fillSDC (sc, sum.getMask(), sum.getArray(), tSysSum/nR, outScanID,
+  fillSDC(sc, sum.getMask(), sum.getArray(), tSysSum/nR, outScanID,
            timeSum/nR, intSum, sourceNameStart, freqIDStart);
 //
@@ -335 +335 @@
 CountedPtr<SDMemTable>
 SDMath::quotient(const CountedPtr<SDMemTable>& on,
-                 const CountedPtr<SDMemTable>& off) 
+                 const CountedPtr<SDMemTable>& off) 
+{
 //
 // Compute quotient spectrum
 //
-{
   const uInt nRows = on->nRow();
   if (off->nRow() != nRows) {
@@ -385 +385 @@
      SDContainer sc = on->getSDContainer(i);
 //
-     putDataInSDC (sc, out, outflagsb);
+     putDataInSDC(sc, out, outflagsb);
      sc.putTsys(tsarr);
      sc.scanid = i;
@@ -399 +399 @@
 
 
-std::vector<float> SDMath::statistic (const CountedPtr<SDMemTable>& in,
-                                      const std::vector<bool>& mask,
-                                      const String& which)
+std::vector<float> SDMath::statistic(const CountedPtr<SDMemTable>& in,
+                                     const std::vector<bool>& mask,
+                                     const String& which)
 //
 // Perhaps iteration over pol/beam/if should be in here
@@ -414 +414 @@
 
   IPosition start, end;
-  getCursorLocation (start, end, *in);
+  getCursorLocation(start, end, *in);
 
 // Loop over rows
@@ -450 +450 @@
 
 
-SDMemTable* SDMath::bin (const SDMemTable& in, Int width)
+SDMemTable* SDMath::bin(const SDMemTable& in, Int width)
 {
   SDHeader sh = in.getSDHeader();
@@ -463 +463 @@
     cSys.addCoordinate(in.getCoordinate(j));
     CoordinateSystem cSysBin = 
-      CoordinateUtil::makeBinnedCoordinateSystem (factors, cSys, False);
+      CoordinateUtil::makeBinnedCoordinateSystem(factors, cSys, False);
 //
     SpectralCoordinate sCBin = cSysBin.spectralCoordinate(0);
@@ -472 +472 @@
 
   IPosition shapeIn(1,sh.nchan);
-  IPosition shapeOut = RebinLattice<Float>::rebinShape (shapeIn, factors);
+  IPosition shapeOut = RebinLattice<Float>::rebinShape(shapeIn, factors);
   sh.nchan = shapeOut(0);
   pTabOut->putSDHeader(sh);
@@ -496 +496 @@
     sc.resize(ip2);
 //
-    putDataInSDC (sc, marrout.getArray(), marrout.getMask());
+    putDataInSDC(sc, marrout.getArray(), marrout.getMask());
 
 // Bin up Tsys.  
@@ -512 +512 @@
 }
 
-SDMemTable* SDMath::simpleOperate (const SDMemTable& in, Float val, Bool doAll,
-                                   uInt what)
+SDMemTable* SDMath::simpleOperate(const SDMemTable& in, Float val, Bool doAll,
+                                  uInt what)
 //
 // what = 0   Multiply
@@ -546 +546 @@
 
       IPosition start, end;
-      getCursorLocation (start, end, in);
+      getCursorLocation(start, end, in);
 //
       for (uInt i=0; i < tOut.nrow(); i++) {
@@ -579 +579 @@
 
 
-SDMemTable* SDMath::averagePol (const SDMemTable& in, const Vector<Bool>& mask)
+SDMemTable* SDMath::averagePol(const SDMemTable& in, const Vector<Bool>& mask)
 //
 // Average all polarizations together, weighted by variance
@@ -585 +585 @@
 {
 //   WeightType wtType = NONE;
-//   convertWeightString (wtType, weight);
+//   convertWeightString(wtType, weight);
 
    const uInt nRows = in.nRow();
@@ -704 +704 @@
       sc.resize(shapeOut);
 //
-      putDataInSDC (sc, outData, outMask);
+      putDataInSDC(sc, outData, outMask);
       pTabOut->putSDContainer(sc);
    }
@@ -712 +712 @@
 
 
-SDMemTable* SDMath::smooth (const SDMemTable& in, const casa::String& kernelType,
-                            casa::Float width, Bool doAll)
+SDMemTable* SDMath::smooth(const SDMemTable& in, 
+                           const casa::String& kernelType,
+                           casa::Float width, Bool doAll)
 {
 
@@ -724 +725 @@
 // Generate Kernel
 
-   VectorKernel::KernelTypes type = VectorKernel::toKernelType (kernelType);
+   VectorKernel::KernelTypes type = VectorKernel::toKernelType(kernelType);
    Vector<Float> kernel = VectorKernel::make(type, width, nChan, True, False);
 
@@ -739 +740 @@
          
   IPosition start, end;
-  getCursorLocation (start, end, in);
+  getCursorLocation(start, end, in);
 //
   IPosition shapeOut(4,1);
@@ -810 +811 @@
 
     SDContainer sc = in.getSDContainer(ri);
-    putDataInSDC (sc, valuesIn, maskIn);
+    putDataInSDC(sc, valuesIn, maskIn);
 //
     pTabOut->putSDContainer(sc);
@@ -824 +825 @@
 // 'private' functions
 
-void SDMath::fillSDC (SDContainer& sc,
-                      const Array<Bool>& mask,
-                      const Array<Float>& data,
-                      const Array<Float>& tSys,
-                      Int scanID, Double timeStamp,
-                      Double interval, const String& sourceName,
-                      const Vector<uInt>& freqID)
+void SDMath::fillSDC(SDContainer& sc,
+                     const Array<Bool>& mask,
+                     const Array<Float>& data,
+                     const Array<Float>& tSys,
+                     Int scanID, Double timeStamp,
+                     Double interval, const String& sourceName,
+                     const Vector<uInt>& freqID)
 {
 // Data and mask
 
-  putDataInSDC (sc, data, mask);
+  putDataInSDC(sc, data, mask);
 
 // TSys
@@ -850 +851 @@
 }
 
-void SDMath::normalize (MaskedArray<Float>& sum,
+void SDMath::normalize(MaskedArray<Float>& sum,
                         const Array<Float>& sumSq,
                         const Array<Float>& nPts,
@@ -883 +884 @@
 
 
-void SDMath::accumulate (Double& timeSum, Double& intSum, Int& nAccum,
-                         MaskedArray<Float>& sum, Array<Float>& sumSq, 
-                         Array<Float>& nPts, Array<Float>& tSysSum, 
-                         const Array<Float>& tSys, const Array<Float>& nInc, 
-                         const Vector<Bool>& mask, Double time, Double interval,
-                         const Block<CountedPtr<SDMemTable> >& in,
-                         uInt iTab, uInt iRow, uInt axis, 
-                         uInt nAxesSub, Bool useMask,
-                         WeightType wtType)
+void SDMath::accumulate(Double& timeSum, Double& intSum, Int& nAccum,
+                        MaskedArray<Float>& sum, Array<Float>& sumSq, 
+                        Array<Float>& nPts, Array<Float>& tSysSum, 
+                        const Array<Float>& tSys, const Array<Float>& nInc, 
+                        const Vector<Bool>& mask, Double time, Double interval,
+                        const Block<CountedPtr<SDMemTable> >& in,
+                        uInt iTab, uInt iRow, uInt axis, 
+                        uInt nAxesSub, Bool useMask,
+                        WeightType wtType)
 {
 
@@ -958 +959 @@
 
 
-void SDMath::getCursorLocation (IPosition& start, IPosition& end,
-                                const SDMemTable& in)
+void SDMath::getCursorLocation(IPosition& start, IPosition& end,
+                               const SDMemTable& in)
 {
   const uInt nDim = 4;
@@ -981 +982 @@
 
 
-void SDMath::convertWeightString (WeightType& wtType, const std::string& weightStr)
+void SDMath::convertWeightString(WeightType& wtType, const std::string& weightStr)
 {
   String tStr(weightStr);
@@ -991 +992 @@
   } else if (tStr.contains(String("TSYS"))) {
      wtType = TSYS;
-     throw (AipsError("T_sys weighting not yet implemented"));
+     throw(AipsError("T_sys weighting not yet implemented"));
   } else {
-    throw (AipsError("Unrecognized weighting type"));
+    throw(AipsError("Unrecognized weighting type"));
   }
 }
 
-void SDMath::putDataInSDC (SDContainer& sc, const Array<Float>& data,
-                           const Array<Bool>& mask)
+void SDMath::putDataInSDC(SDContainer& sc, const Array<Float>& data,
+                          const Array<Bool>& mask)
 {
     sc.putSpectrum(data);