Changeset 1516 for branches

Timestamp:

02/24/09 14:12:51 (16 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-1079)

Ready to Release: Yes

Interface Changes: Yes

What Interface Changed: Changed names of functions

1. (NEW) std::vector<int> asap::python::stmath::_minmaxchan (OLD) std::vector<int> asap::python::stmath::_minmaxpos @python_STMath.cpp
2. (NEW) std::vector<int> STMathWrapper::minMaxChan (OLD) std::vector<int> STMathWrapper::minMaxPos @STMathWrapper.h
3. (NEW) std::vector<int> STMath::minMaxChan (OLD) std::vector<int> STMath::minMaxPos @STMath.h & .cpp

Test Programs:

Run scantable.stats() with the parameter stat='min_abc' or 'max_abc',
and you(ll get min/max value with its position.
Notice that parameter names to select in scantable.stats() are also changed.

Put in Release Notes: No

Module(s): scantable.stats()

Description:

The names of functions are changed from rev. 1514.

These modifications are to return min/max value with its
position (channel/frequency/velocity) by running scantable.stats().

Diagram:
scantable.stats() ->asap::python::stmath::_minmaxchan
-> STMathWrapper::minMaxChan -> STMath::minMaxChan() -> mathutil::minMaxPos()
-> casa::minMax (@casacore/casa/casa/Arrays/MaskArrMath.tcc)

Location:

branches/alma/src

Files:

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

branches/alma/src/MathUtils.cpp

@@ -84 +84 @@
    String str(which);
    str.upcase();
-   if (str.matches(String("MINPOS"))) {
+   if (str.matches(String("MIN_ABC"))) {
      return minPos;
-   } else if (str.matches(String("MAXPOS"))) {
+   } else if (str.matches(String("MAX_ABC"))) {
      return maxPos;
    } else {

branches/alma/src/STMath.cpp

@@ -1097 +1097 @@
 }
 
-std::vector< int > STMath::minMaxPos( const CountedPtr< Scantable > & in,
+std::vector< int > STMath::minMaxChan( const CountedPtr< Scantable > & in,
                                         const std::vector< bool > & mask,
                                         const std::string& which )
@@ -1113 +1113 @@
     if (ma.ndim() != 1) {
       throw (ArrayError(
-          "std::vector<int> STMath::minMaxPos("
+          "std::vector<int> STMath::minMaxChan("
           "ContedPtr<Scantable> &in, std::vector<bool> &mask, "
           " std::string &which)"

branches/alma/src/STMath.h

@@ -207 +207 @@
                                const std::string& which);
 
-  std::vector< int > minMaxPos(const casa::CountedPtr<Scantable>& in,
-                               const std::vector<bool>& mask,
-                               const std::string& which);
+  std::vector< int > minMaxChan(const casa::CountedPtr<Scantable>& in,
+                                const std::vector<bool>& mask,
+                                const std::string& which);
 
   casa::CountedPtr<Scantable> bin( const casa::CountedPtr<Scantable>& in,

branches/alma/src/STMathWrapper.h

@@ -121 +121 @@
   { return STMath::statistic(in.getCP(), mask, which); }
 
-  std::vector<int> minMaxPos(const ScantableWrapper& in,
+  std::vector<int> minMaxChan(const ScantableWrapper& in,
                                const std::vector<bool>& mask,
                                const std::string& which)
-  { return STMath::minMaxPos(in.getCP(), mask, which); }
+  { return STMath::minMaxChan(in.getCP(), mask, which); }
 
   ScantableWrapper bin( const ScantableWrapper& in, int width=5)

branches/alma/src/python_STMath.cpp

@@ -57 +57 @@
         .def("_dofs", &STMathWrapper::dofs)
         .def("_stats", &STMathWrapper::statistic)
-        .def("_minmaxpos", &STMathWrapper::minMaxPos)
+        .def("_minmaxchan", &STMathWrapper::minMaxChan)
         .def("_freqswitch", &STMathWrapper::freqSwitch)
         .def("_bin", &STMathWrapper::bin)