Changeset 867 for trunk/src

Timestamp:

03/06/06 10:50:34 (19 years ago)

Author:

mar637

Message:

gainEl interface change to std::vector
bug fix: forgot ++iter

Location:

trunk/src

Files:

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

trunk/src/STMath.cpp

@@ -344 +344 @@
     convertArray(flags1, !m1);
     flagCol.put(1, flags1);
-
+    ++iter;
   }
 
@@ -362 +362 @@
   for (uInt i=0; i < tab.nrow(); ++i ) {
     Vector<Float> spec; specCol.get(i, spec);
-    MaskedArray<Float> ma  = maskedArray(spec, flagCol(i));
-    float outstat;
+    Vector<uChar> flag; flagCol.get(i, flag);
+    MaskedArray<Float> ma  = maskedArray(spec, flag);
+    float outstat = 0.0;
     if ( spec.nelements() == m.nelements() ) {
       outstat = mathutil::statistics(which, ma(m));
@@ -513 +514 @@
 
 CountedPtr< Scantable > STMath::gainElevation( const CountedPtr< Scantable >& in,
-                                               const Vector< Float > & coeffs,
+                                               const vector< float > & coeff,
                                                const std::string & filename,
                                                const std::string& method)
@@ -524 +525 @@
   x *= Float(180 / C::pi);                        // Degrees
 
+  Vector<Float> coeffs(coeff);
   const uInt nc = coeffs.nelements();
   if ( filename.length() > 0 && nc > 0 ) {
@@ -743 +745 @@
       flagCol.put(i, flagsFromMA(ma));
     }
+  ++iter;
   }
 }
@@ -801 +804 @@
       specCol.put(i, specout);
     }
+    ++iter;
   }
   return out;

trunk/src/STMath.h

@@ -86 +86 @@
   casa::CountedPtr<Scantable>
     gainElevation(const casa::CountedPtr<Scantable>& in,
-                  const casa::Vector<casa::Float>& coeffs,
+                  const std::vector<float>& coeff,
                   const std::string& fileName,
                   const std::string& method);