Changeset 2569 for branches

Timestamp:

06/14/12 13:07:35 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2816

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Skip to call residual method to get model (fitted result).
Instead model is calculated as data-residual.

File:

• branches/hpc33/src/STFitter.cpp (modified) (4 diffs)

branches/hpc33/src/STFitter.cpp

@@ -376 +376 @@
 
   // Fit
-  Vector<Float> sigma(x_.nelements());
-  sigma = 1.0;
+//   Vector<Float> sigma(x_.nelements());
+//   sigma = 1.0;
 
   parameters_.resize();
-  parameters_ = fitter.fit(x_, y_, sigma, &m_);
+//   parameters_ = fitter.fit(x_, y_, sigma, &m_);
+  parameters_ = fitter.fit(x_, y_, &m_);  
   if ( !fitter.converged() ) {
      return false;
@@ -398 +399 @@
   // use fitter.residual(model=True) to get the model
   thefit_.resize(x_.nelements());
-  fitter.residual(thefit_,x_,True);
+  // model = data - residual
+//   fitter.residual(thefit_,x_,True);
+  thefit_ = y_ - residual_ ;
   return true;
 }
@@ -417 +420 @@
 
   // Fit
-  Vector<Float> sigma(x_.nelements());
-  sigma = 1.0;
+//   Vector<Float> sigma(x_.nelements());
+//   sigma = 1.0;
 
   parameters_.resize();
-  parameters_ = fitter.fit(x_, y_, sigma, &m_);
+//   parameters_ = fitter.fit(x_, y_, sigma, &m_);
+  parameters_ = fitter.fit(x_, y_, &m_);
   std::vector<float> ps;
   parameters_.tovector(ps);
@@ -436 +440 @@
   // use fitter.residual(model=True) to get the model
   thefit_.resize(x_.nelements());
-  fitter.residual(thefit_,x_,True);
+  // model = data - residual
+//   fitter.residual(thefit_,x_,True);
+  thefit_ = y_ - residual_ ;
   return true;
 }