Changeset 2143

Timestamp:

04/18/11 12:13:08 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: sdmath unit test (coming soon)

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix on subtraction and division of scantable.

File:

• trunk/src/STMath.cpp (modified) (6 diffs)

trunk/src/STMath.cpp

@@ -492 +492 @@
   ArrayColumn<Float> specCol(tab,"SPECTRA");
   ArrayColumn<Float> tsysCol(tab,"TSYS");
+  if (mode=="DIV") val = 1.0/val ;
+  else if (mode=="SUB") val *= -1.0 ;
   for (uInt i=0; i<tab.nrow(); ++i) {
     Vector<Float> spec;
@@ -498 +500 @@
     tsysCol.get(i, ts);
     if (mode == "MUL" || mode == "DIV") {
-      if (mode == "DIV") val = 1.0/val;
+      //if (mode == "DIV") val = 1.0/val;
       spec *= val;
       specCol.put(i, spec);
@@ -506 +508 @@
       }
     } else if ( mode == "ADD"  || mode == "SUB") {
-      if (mode == "SUB") val *= -1.0;
+      //if (mode == "SUB") val *= -1.0;
       spec += val;
       specCol.put(i, spec);
@@ -587 +589 @@
   ArrayColumn<Float> specCol(tab,"SPECTRA");
   ArrayColumn<Float> tsysCol(tab,"TSYS");
+  if (mode == "DIV") fact = (float)1.0 / fact;
+  else if (mode == "SUB") fact *= (float)-1.0 ;
   for (uInt i=0; i<tab.nrow(); ++i) {
     Vector<Float> spec;
@@ -593 +597 @@
     tsysCol.get(i, ts);
     if (mode == "MUL" || mode == "DIV") {
-      if (mode == "DIV") fact = (float)1.0 / fact;
+      //if (mode == "DIV") fact = (float)1.0 / fact;
       spec *= fact;
       specCol.put(i, spec);
@@ -601 +605 @@
       }
     } else if ( mode == "ADD"  || mode == "SUB") {
-      if (mode == "SUB") fact *= (float)-1.0 ;
+      //if (mode == "SUB") fact *= (float)-1.0 ;
       spec += fact;
       specCol.put(i, spec);