Changeset 1757 for branches/alma/src/RowAccumulator.cpp

Timestamp:

06/09/10 19:03:06 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-2211)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: ASAP 3.0.0 interface changes

Test Programs:

Put in Release Notes: Yes

Module(s): all the CASA sd tools and tasks are affected.

Description: Merged ATNF-ASAP 3.0.0 developments to CASA (alma) branch.

Note you also need to update casa/code/atnf.

Location:

branches/alma

Files:

• . (modified) (2 props)
• src/RowAccumulator.cpp (modified) (3 diffs)

branches/alma/src/RowAccumulator.cpp

@@ -67 +67 @@
   Float totalweight = weight;
   MaskedArray<Float> data(v,m);
-  if ( weightType_ == asap::VAR ) {
+  if ( weightType_ == asap::W_VAR ) {
     if (m.nelements() == userMask_.nelements()) {
       Float fac = 1.0/variance(data(userMask_));
@@ -90 +90 @@
   Float w = 1.0;
   tsysSum_ += v[0];
-  if ( weightType_ == asap::TSYS  || weightType_ == asap::TINTSYS ) {
+  if ( weightType_ == asap::W_TSYS  || weightType_ == asap::W_TINTSYS ) {
     w /= (v[0]*v[0]);
   }
@@ -105 +105 @@
   Float w = 1.0;
   intervalSum_ += inter;
-  if ( weightType_ == asap::TINT || weightType_ == asap::TINTSYS ) {
+  if ( weightType_ == asap::W_TINT || weightType_ == asap::W_TINTSYS ) {
     w /= Float(inter);
   }