Changeset 1919 for trunk


Ignore:
Timestamp:
09/06/10 13:01:07 (14 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: ori_sio_task_regression

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Changed variables for memory address in C++ int to long.
I don't believe that this change essentially fixes the problem.
However, it may improve the situation since 'long' is able to
represent larger integer value than 'int'.


Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/python/scantable.py

    r1916 r1919  
    20592059                return workscan
    20602060           
    2061         except RuntimeError:
     2061        except RuntimeError, e:
    20622062            msg = "The fit failed, possibly because it didn't converge."
    20632063            if rcParams["verbose"]:
     2064                asaplog.push(str(e))
    20642065                asaplog.push(str(msg))
    20652066                return
    20662067            else:
    2067                 raise RuntimeError(msg)
     2068                raise RuntimeError(str(e)+'\n'+msg)
    20682069
    20692070
  • trunk/src/Scantable.cpp

    r1908 r1919  
    17571757}
    17581758
    1759 void Scantable::polyBaseline(const std::vector<bool>& mask, int order, int rowno, int pars_ptr, int pars_size, int errs_ptr, int errs_size, int fmask_ptr, int fmask_size)
     1759void Scantable::polyBaseline(const std::vector<bool>& mask, int order, int rowno, long pars_ptr, long pars_size, long errs_ptr, long errs_size, long fmask_ptr, long fmask_size)
    17601760{
    17611761  Fitter fitter = Fitter();
  • trunk/src/Scantable.h

    r1908 r1919  
    490490
    491491  void polyBaselineBatch(const std::vector<bool>& mask, int order, int rowno);
    492   void polyBaseline(const std::vector<bool>& mask, int order, int rowno, int pars_ptr, int pars_size, int errs_ptr, int errs_size, int fmask_ptr, int fmask_size);
     492  void polyBaseline(const std::vector<bool>& mask, int order, int rowno, long pars_ptr, long pars_size, long errs_ptr, long errs_size, long fmask_ptr, long fmask_size);
    493493
    494494
  • trunk/src/ScantableWrapper.h

    r1908 r1919  
    250250  { table_->reshapeSpectrum( nmin, nmax ); }
    251251
    252   void polyBaseline(const std::vector<bool>& mask, int order, int rowno, int pars_ptr, int pars_size, int errs_ptr, int errs_size, int fmask_ptr, int fmask_size)
     252  void polyBaseline(const std::vector<bool>& mask, int order, int rowno, long pars_ptr, long pars_size, long errs_ptr, long errs_size, long fmask_ptr, long fmask_size)
    253253  { table_->polyBaseline(mask, order, rowno, pars_ptr, pars_size, errs_ptr, errs_size, fmask_ptr, fmask_size); }
    254254
Note: See TracChangeset for help on using the changeset viewer.