Changeset 2134 for branches


Ignore:
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:
12 edited

Legend:

Unmodified
Added
Removed
  • branches/casa-prerelease/pre-asap

    • Property svn:mergeinfo changed
      /trunkmerged: 2133
  • branches/casa-prerelease/pre-asap/Makefile

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/casa-prerelease/pre-asap/SConstruct

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/casa-prerelease/pre-asap/apps

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/casa-prerelease/pre-asap/external-alma

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/casa-prerelease/pre-asap/getsvnrev.sh

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/casa-prerelease/pre-asap/python

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/casa-prerelease/pre-asap/src

  • branches/casa-prerelease/pre-asap/src/SConscript

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/casa-prerelease/pre-asap/src/STMath.cpp

    r2126 r2134  
    31943194        taqlstream << "SELECT FROM $1 WHERE FREQ_ID IN [" ;
    31953195        for ( uInt i = 0 ; i < freqidlist.size() ; i++ ) {
    3196           taqlstream << i ;
     3196          taqlstream << freqidlist[i] ;
    31973197          if ( i < freqidlist.size() - 1 )
    31983198            taqlstream << "," ;
     
    33993399          //os << "tableid = " << tableid << " rowid = " << rowid << ": " << LogIO::POST ;
    34003400          //os << "   regridChannel applied to " ;
    3401           if ( tableid != reftable )
    3402             refreqid = newin[tableid]->frequencies().addEntry( refpixref, refvalref, refinc ) ;
     3401          //if ( tableid != reftable )
     3402          refreqid = newin[tableid]->frequencies().addEntry( refpixref, refvalref, refinc ) ;
    34033403          for ( uInt irow = 0 ; irow < newin[tableid]->table().nrow() ; irow++ ) {
    34043404            uInt tfreqid = freqIdVec[tableid][irow] ;
  • branches/casa-prerelease/pre-asap/src/Scantable.cpp

    r2132 r2134  
    15561556  int ichan = 0 ;
    15571557  double wsum = 0.0 ;
    1558   Vector<Float> z( nChan ) ;
    1559   z[0] = abcissa[0] - 0.5 * olddnu + 0.5 * dnu ;
    1560   for ( int ii = 1 ; ii < nChan ; ii++ )
    1561     z[ii] = z[ii-1] + dnu ;
    15621558  Vector<Float> zi( nChan+1 ) ;
    15631559  Vector<Float> yi( oldsize + 1 ) ;
    1564   zi[0] = z[0] - 0.5 * dnu ;
    1565   zi[1] = z[0] + 0.5 * dnu ;
     1560  zi[0] = abcissa[0] - 0.5 * olddnu ;
     1561  zi[1] = zi[1] + dnu ;
    15661562  for ( int ii = 2 ; ii < nChan ; ii++ )
    1567     zi[ii] = zi[ii-1] + dnu ;
    1568   zi[nChan] = z[nChan-1] + 0.5 * dnu ;
     1563    zi[ii] = zi[0] + dnu * ii ;
     1564  zi[nChan] = zi[nChan-1] + dnu ;
    15691565  yi[0] = abcissa[0] - 0.5 * olddnu ;
    15701566  yi[1] = abcissa[1] + 0.5 * olddnu ;
     
    16151611        }
    16161612      }
    1617       newspec[ii] /= wsum ;
     1613      if ( wsum != 0.0 )
     1614        newspec[ii] /= wsum ;
    16181615      wsum = 0.0 ;
    16191616    }
     
    16621659        }
    16631660      }
    1664       newspec[ii] /= wsum ;
     1661      if ( wsum != 0.0 )
     1662        newspec[ii] /= wsum ;
    16651663      wsum = 0.0 ;
    16661664    }
Note: See TracChangeset for help on using the changeset viewer.