Changeset 1703 for branches/alma

Timestamp:

02/17/10 11:53:11 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready to Release: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Fixed several bugs in Scantable::clip() method.

Location:

branches/alma/src

Files:

• Scantable.cpp (modified) (3 diffs)
• Scantable.h (modified) (1 diff)
• ScantableWrapper.h (modified) (1 diff)

branches/alma/src/Scantable.cpp

@@ -708 +708 @@
     Vector<Float> spcs = specCol_(i);
     Vector<uChar> flgs = flagsCol_(i);
-    if (spcs.nelements() != nchan) {
+    if (spcs.nelements() != nchan()) {
       throw(AipsError("Data has incorrect number of channels"));
     }
@@ -716 +716 @@
     }
     if (clipoutside) {
-      for (uInt j = 0; j < nchan; ++j) {
+      for (uInt j = 0; j < nchan(); ++j) {
         Float spc = spcs(j);
         if ((spc >= uthres) || (spc <= dthres)) {
@@ -723 +723 @@
       }
     } else {
-      for (uInt j = 0; j < nchan; ++j) {
+      for (uInt j = 0; j < nchan(); ++j) {
         Float spc = spcs(j);
         if ((spc < uthres) && (spc > dthres)) {

branches/alma/src/Scantable.h

@@ -247 +247 @@
    * (CAS-1807 Wataru Kawasaki)
    */
-  void Scantable::clip(const Float uthres, const Float dthres, bool clipoutside, bool unflag);
+  void clip(const casa::Float uthres, const casa::Float dthres, bool clipoutside, bool unflag);
 
   /**

branches/alma/src/ScantableWrapper.h

@@ -114 +114 @@
     { return table_->getFlagRow(whichrow); }
 
-  void clip(const Float uthres, const Float dthres, bool clipoutside=true, bool unflag=false)
+  void clip(const casa::Float uthres, const casa::Float dthres, bool clipoutside=true, bool unflag=false)
     { table_->clip(uthres, dthres, clipoutside, unflag); }