Changeset 653

Timestamp:

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

Author:

mar637

Message:

changed Blocks to vectors

Location:

trunk/src

Files:

• SDMath.cc (modified) (5 diffs)
• SDMath.h (modified) (4 diffs)
• python_SDMath.cc (modified) (4 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,

trunk/src/SDMath.h

@@ -78 +78 @@
 
 // Average in time
-   casa::CountedPtr<SDMemTable>  average(const casa::Block<casa::CountedPtr<SDMemTable> >& in,
-                                         const casa::Vector<casa::Bool>& mask,
-                                         casa::Bool scanAverage, 
-                                         const casa::String& weightStr,
-                                         casa::Bool align=casa::False) const;
+   casa::CountedPtr<SDMemTable> 
+   average(const std::vector<casa::CountedPtr<SDMemTable> >& in,
+           const casa::Vector<casa::Bool>& mask,
+           casa::Bool scanAverage, 
+           const casa::String& weightStr,
+           casa::Bool align=casa::False) const;
 
 // Statistics. If row<0, all rows are done otherwise, just the 
@@ -140 +141 @@
 // Function to use accumulate data during time averaging
 
-  void accumulate (casa::Double& timeSum, casa::Double& intSum, casa::Int& nAccum,
-                   casa::MaskedArray<casa::Float>& sum, casa::Array<casa::Float>& sumSq,
-                   casa::Array<casa::Float>& nPts, casa::Array<casa::Float>& tSysSum,
-                   casa::Array<casa::Float>& tSysSqSum,
-                   const casa::Array<casa::Float>& tSys,  const casa::Array<casa::Float>& nInc,
-                   const casa::Vector<casa::Bool>& mask, casa::Double time, casa::Double interval,
-                   const casa::Block<casa::CountedPtr<SDMemTable> >& in,
-                   casa::uInt iTab, casa::uInt iRow, casa::uInt axis, casa::uInt nAxesSub,
-                   casa::Bool useMask, WeightType wtType) const;
+  void accumulate(casa::Double& timeSum, casa::Double& intSum, 
+                  casa::Int& nAccum,
+                  casa::MaskedArray<casa::Float>& sum, 
+                  casa::Array<casa::Float>& sumSq,
+                  casa::Array<casa::Float>& nPts, 
+                  casa::Array<casa::Float>& tSysSum,
+                  casa::Array<casa::Float>& tSysSqSum,
+                  const casa::Array<casa::Float>& tSys,  
+                  const casa::Array<casa::Float>& nInc,
+                  const casa::Vector<casa::Bool>& mask, 
+                  casa::Double time, casa::Double interval,
+                  const std::vector<casa::CountedPtr<SDMemTable> >& in,
+                  casa::uInt iTab, casa::uInt iRow, 
+                  casa::uInt axis, casa::uInt nAxesSub,
+                  casa::Bool useMask, WeightType wtType) const;
 
 // Work out conversion factor for converting Jy<->K per IF per row and apply
@@ -201 +208 @@
                               casa::MFrequency::Types system,
                               const casa::String& timeRef,
-                              const casa::String& method, casa::Bool perIF) const;
+                              const casa::String& method, 
+                               casa::Bool perIF) const;
 
 // Generate frequency aligners
@@ -209 +217 @@
                                    casa::MFrequency::Types system,
                                    const casa::MPosition& refPos,
-                                   const casa::MEpoch& refEpoch, casa::Bool perFreqID) const;
+                                   const casa::MEpoch& refEpoch, 
+                                   casa::Bool perFreqID) const;
 
 // Generate data description table (combines source and freqID)

trunk/src/python_SDMath.cc

@@ -30 +30 @@
 //#---------------------------------------------------------------------------
 #include <boost/python.hpp>
+#include <vector>
 
 #include <casa/aips.h>
@@ -49 +50 @@
       int n;
       n = extract<int>(tp.attr("__len__")());
-      Block<CountedPtr<asap::SDMemTable> > b(n);
+      std::vector<CountedPtr<asap::SDMemTable> > b(n);
+      //Block<CountedPtr<asap::SDMemTable> > b(n);
       for (int i=0;i< n;++i) {
         SDMemTableWrapper sdmw =
@@ -56 +58 @@
       }
       Vector<Bool> msk(mask);
-//
+      //
       SDMath sdm;
       return SDMemTableWrapper(sdm.average(b, msk, Bool(scanAv), weightStr));
@@ -65 +67 @@
     void python_SDMath() {
       def("b_operate", &SDMathWrapper::binaryOperate);
-//
+      //
       def("quotient", &SDMathWrapper::quotient);
 //