Changeset 2133 for trunk/src/Scantable.cpp

Timestamp:

04/14/11 10:44:45 (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: sdaverage unit test

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

averageall parameter bug fix.

File:

• trunk/src/Scantable.cpp (modified) (3 diffs)

trunk/src/Scantable.cpp

@@ -1570 +1570 @@
   int ichan = 0 ;
   double wsum = 0.0 ;
-  Vector<Float> z( nChan ) ;
-  z[0] = abcissa[0] - 0.5 * olddnu + 0.5 * dnu ;
-  for ( int ii = 1 ; ii < nChan ; ii++ )
-    z[ii] = z[ii-1] + dnu ;
   Vector<Float> zi( nChan+1 ) ;
   Vector<Float> yi( oldsize + 1 ) ;
-  zi[0] = z[0] - 0.5 * dnu ;
-  zi[1] = z[0] + 0.5 * dnu ;
+  zi[0] = abcissa[0] - 0.5 * olddnu ;
+  zi[1] = zi[1] + dnu ;
   for ( int ii = 2 ; ii < nChan ; ii++ )
-    zi[ii] = zi[ii-1] + dnu ;
-  zi[nChan] = z[nChan-1] + 0.5 * dnu ;
+    zi[ii] = zi[0] + dnu * ii ;
+  zi[nChan] = zi[nChan-1] + dnu ;
   yi[0] = abcissa[0] - 0.5 * olddnu ;
   yi[1] = abcissa[1] + 0.5 * olddnu ;
@@ -1629 +1625 @@
         }
       }
-      newspec[ii] /= wsum ;
+      if ( wsum != 0.0 )
+        newspec[ii] /= wsum ;
       wsum = 0.0 ;
     }
@@ -1676 +1673 @@
         }
       }
-      newspec[ii] /= wsum ;
+      if ( wsum != 0.0 )
+        newspec[ii] /= wsum ;
       wsum = 0.0 ;
     }