Changeset 653 for trunk/src/SDMath.cc

Timestamp:

06/22/05 16:06:07 (19 years ago)

Author:

mar637

Message:

changed Blocks to vectors

File:

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

trunk/src/SDMath.cc

@@ -46 +46 @@
 #include <casa/Arrays/Matrix.h>
 #include <casa/BasicMath/Math.h>
-#include <casa/Containers/Block.h>
 #include <casa/Exceptions.h>
 #include <casa/Quanta/Quantum.h>
@@ -139 +138 @@
 
 
-CountedPtr<SDMemTable> SDMath::average(const Block<CountedPtr<SDMemTable> >& in,
+CountedPtr<SDMemTable> SDMath::average(const std::vector<CountedPtr<SDMemTable> >& in,
                                        const Vector<Bool>& mask, Bool scanAv,
                                        const String& weightStr, Bool alignFreq) const
@@ -155 +154 @@
 
   SDMemTable* pTabOut = new SDMemTable(*in[0],True);
-  if (in.nelements() > 1) {
-    for (uInt i=1; i < in.nelements(); ++i) {
+  if (in.size() > 1) {
+    for (uInt i=1; i < in.size(); ++i) {
       pTabOut->appendToHistoryTable(in[i]->getHistoryTable());
     }
@@ -252 +251 @@
 
   Float fac = 1.0;
-  const uInt nTables = in.nelements();
+  const uInt nTables = in.size();
   for (uInt iTab=0; iTab<nTables; iTab++) {
 
@@ -1773 +1772 @@
                         const Array<Float>& tSys, const Array<Float>& nInc, 
                         const Vector<Bool>& mask, Double time, Double interval,
-                        const Block<CountedPtr<SDMemTable> >& in,
+                        const std::vector<CountedPtr<SDMemTable> >& in,
                         uInt iTab, uInt iRow, uInt axis, 
                         uInt nAxesSub, Bool useMask,