Changeset 2868


Ignore:
Timestamp:
12/02/13 13:25:27 (11 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: test_sdgrid

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Removed warning during compile.


File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/STGrid.cpp

    r2851 r2868  
    554554  const Int pol;
    555555  STContext(STGrid *obj, STCommonData &common, Int pol)
    556     : self(obj), common(common), pol(pol) {}
     556    : common(common), self(obj), pol(pol) {}
    557557};
    558558
     
    563563  const Int pol;
    564564  STContextWithClipping(STGrid *obj, STCommonDataWithClipping &common, Int pol)
    565     : self(obj), common(common), pol(pol) {}
     565    : common(common), self(obj), pol(pol) {}
    566566};
    567567
     
    10211021  t0 = mathutil::gettimeofday_sec() ;
    10221022  uInt len = data_.nelements() ;
    1023   const Complex *w1_p ;
    1024   Float *w2_p ;
    10251023  Bool b1, b2, b3 ;
    10261024  const Complex *gdata_p = gdata.getStorage( b1 ) ;
    1027   Float *gwgt_p = data_.getStorage( b2 ) ;
     1025  Float *gwgt_p = gwgt.getStorage( b2 ) ; // storage shared with data_
    10281026  uChar *gflg_p = flag_.getStorage( b3 ) ;
    10291027  for ( uInt i = 0 ; i < len ; i++ ) {
     
    12391237void STGrid::table( Table &tab, uInt i )
    12401238{
    1241   if ( i >= 0 && i < nfile_ )
     1239  if ( i < nfile_ )
    12421240    tab = Table( infileList_[i] ) ;
    12431241}
     
    13081306                         IPosition const &wshape,
    13091307                         IPosition const &vshape,
    1310                          IPosition const &dshape,
     1308                         IPosition const &/* dshape */,
    13111309                         Array<Complex> &spectra,
    13121310                         Array<Double> &direction,
     
    17991797    // determine pixel gwidth
    18001798    // default is HWHM corresponding to b = 1.0 (Mangum et al. 2007)
    1801     Double pixelGW;
     1799    Double pixelGW = -1.0;
    18021800    Quantum<Double> q ;
    18031801    if (!gwidth_.empty()) {
     
    18171815    // determine truncation radius
    18181816    // default is 3 * HWHM
    1819     Double truncate;
     1817    Double truncate = -1.0;
    18201818    if (!truncate_.empty()) {
    18211819      readQuantity( q, truncate_ );
     
    18431841    // determine pixel gwidth
    18441842    // default is HWHM corresponding to b = 2.52 (Mangum et al. 2007)
    1845     Double pixelGW;
     1843    Double pixelGW = -1.0;
    18461844    Quantum<Double> q ;
    18471845    if (!gwidth_.empty()) {
     
    18611859    // determine pixel c
    18621860    // default is c = 1.55 (Mangum et al. 2007)
    1863     Double pixelJW;
     1861    Double pixelJW = -1.0;
    18641862    if (!jwidth_.empty()) {
    18651863      readQuantity( q, jwidth_ );
     
    19651963void STGrid::fillTable( Table &tab )
    19661964{
    1967   IPosition dshape = data_.shape() ;
     1965  //IPosition dshape = data_.shape() ;
    19681966  Int nrow = nx_ * ny_ * npol_ ;
    19691967  tab.rwKeywordSet().define( "nPol", npol_ ) ;
Note: See TracChangeset for help on using the changeset viewer.