Changeset 1907 for trunk/src/STMath.cpp

Timestamp:

08/26/10 19:46:26 (14 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes CAS-1937,CAS-2373

Ready to Release: Yes

Interface Changes: Yes

What Interface Changed: A new parameter 'batch' was added to

sd.scantable.poly_baseline(), while
'uselin' was removed.

Test Programs:

Put in Release Notes: Yes

Module(s): sdbaseline

Description: A faster version of sd.scantable.poly_baseline().

File:

• trunk/src/STMath.cpp (modified) (1 diff)

trunk/src/STMath.cpp

@@ -1796 +1796 @@
     out.push_back(outstat);
   }
+  return out;
+}
+
+std::vector< float > STMath::statisticRow( const CountedPtr< Scantable > & in,
+                                        const std::vector< bool > & mask,
+                                        const std::string& which,
+                                        int row )
+{
+
+  Vector<Bool> m(mask);
+  const Table& tab = in->table();
+  ROArrayColumn<Float> specCol(tab, "SPECTRA");
+  ROArrayColumn<uChar> flagCol(tab, "FLAGTRA");
+  std::vector<float> out;
+
+  Vector<Float> spec; specCol.get(row, spec);
+  Vector<uChar> flag; flagCol.get(row, flag);
+  MaskedArray<Float> ma  = maskedArray(spec, flag);
+  float outstat = 0.0;
+  if ( spec.nelements() == m.nelements() ) {
+    outstat = mathutil::statistics(which, ma(m));
+  } else {
+    outstat = mathutil::statistics(which, ma);
+  }
+  out.push_back(outstat);
+
   return out;
 }