Changeset 858 for trunk/src

Timestamp:

03/01/06 11:49:55 (19 years ago)

Author:

mar637

Message:

changed average interface to use std::vector<bool> instead of casa::Vector
added default arguments to average

Location:

trunk/src

Files:

• STMath.cpp (modified) (2 diffs)
• STMath.h (modified) (1 diff)

trunk/src/STMath.cpp

@@ -55 +55 @@
 CountedPtr<Scantable>
 STMath::average( const std::vector<CountedPtr<Scantable> >& in,
-                 const Vector<Bool>& mask,
+                 const std::vector<bool>& mask,
                  const std::string& weight,
                  const std::string& avmode,
@@ -107 +107 @@
   }
   RowAccumulator acc(wtype);
-  acc.setUserMask(mask);
+  Vector<Bool> cmask(mask);
+  acc.setUserMask(cmask);
   ROTableRow row(tout);
   ROArrayColumn<Float> specCol, tsysCol;

trunk/src/STMath.h

@@ -54 +54 @@
   casa::CountedPtr<Scantable>
     average( const std::vector<casa::CountedPtr<Scantable> >& in,
-             const casa::Vector<casa::Bool>& mask,
-             const std::string& weight,
-             const std::string& avmode = "",
+             const std::vector<bool>& mask = std::vector<bool>(),
+             const std::string& weight = "NONE",
+             const std::string& avmode = "SCAN",
              bool alignfreq = false );