Changeset 1919 for trunk

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:

• python/scantable.py (modified) (1 diff)
• src/Scantable.cpp (modified) (1 diff)
• src/Scantable.h (modified) (1 diff)
• src/ScantableWrapper.h (modified) (1 diff)

trunk/python/scantable.py

@@ -2059 +2059 @@
                 return workscan
             
-        except RuntimeError:
+        except RuntimeError, e:
             msg = "The fit failed, possibly because it didn't converge."
             if rcParams["verbose"]:
+                asaplog.push(str(e))
                 asaplog.push(str(msg))
                 return
             else:
-                raise RuntimeError(msg)
+                raise RuntimeError(str(e)+'\n'+msg)
 
 

trunk/src/Scantable.cpp

@@ -1757 +1757 @@
 }
 
-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)
+void 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)
 {
   Fitter fitter = Fitter();

trunk/src/Scantable.h

@@ -490 +490 @@
 
   void polyBaselineBatch(const std::vector<bool>& mask, int order, int rowno);
-  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);
+  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);
 
 

trunk/src/ScantableWrapper.h

@@ -250 +250 @@
   { table_->reshapeSpectrum( nmin, nmax ); }
 
-  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)
+  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)
   { table_->polyBaseline(mask, order, rowno, pars_ptr, pars_size, errs_ptr, errs_size, fmask_ptr, fmask_size); }