Changeset 2134 for branches/casa-prerelease

Timestamp:

04/14/11 10:53:12 (14 years ago)

Author:

Takeshi Nakazato

Message:

merge bug fix in trunk (r2133).

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• src (modified) (1 prop)
• src/SConscript (modified) (1 prop)
• src/STMath.cpp (modified) (2 diffs)
• src/Scantable.cpp (modified) (3 diffs)

branches/casa-prerelease/pre-asap/src/STMath.cpp

@@ -3194 +3194 @@
         taqlstream << "SELECT FROM $1 WHERE FREQ_ID IN [" ;
         for ( uInt i = 0 ; i < freqidlist.size() ; i++ ) {
-          taqlstream << i ;
+          taqlstream << freqidlist[i] ;
           if ( i < freqidlist.size() - 1 )
             taqlstream << "," ;
@@ -3399 +3399 @@
           //os << "tableid = " << tableid << " rowid = " << rowid << ": " << LogIO::POST ;
           //os << "   regridChannel applied to " ;
-          if ( tableid != reftable ) 
-            refreqid = newin[tableid]->frequencies().addEntry( refpixref, refvalref, refinc ) ;
+          //if ( tableid != reftable ) 
+          refreqid = newin[tableid]->frequencies().addEntry( refpixref, refvalref, refinc ) ;
           for ( uInt irow = 0 ; irow < newin[tableid]->table().nrow() ; irow++ ) {
             uInt tfreqid = freqIdVec[tableid][irow] ;

branches/casa-prerelease/pre-asap/src/Scantable.cpp

@@ -1556 +1556 @@
   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 ;
@@ -1615 +1611 @@
         }
       }
-      newspec[ii] /= wsum ;
+      if ( wsum != 0.0 )
+        newspec[ii] /= wsum ;
       wsum = 0.0 ;
     }
@@ -1662 +1659 @@
         }
       }
-      newspec[ii] /= wsum ;
+      if ( wsum != 0.0 )
+        newspec[ii] /= wsum ;
       wsum = 0.0 ;
     }