Changeset 2570 for branches

Timestamp:

06/14/12 15:22:52 (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...

Calculate residual as (data-model) instead to calculate model as
(data-residual) since the later changes result.

File:

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

branches/hpc33/src/STFitter.cpp

@@ -394 +394 @@
   chisquared_ = fitter.getChi2();
 
-  residual_.resize();
-  residual_ =  y_;
-  fitter.residual(residual_,x_);
+//   residual_.resize();
+//   residual_ =  y_;
+//   fitter.residual(residual_,x_);
   // use fitter.residual(model=True) to get the model
   thefit_.resize(x_.nelements());
-  // model = data - residual
-//   fitter.residual(thefit_,x_,True);
-  thefit_ = y_ - residual_ ;
+  fitter.residual(thefit_,x_,True);
+  // residual = data - model
+  residual_.resize(x_.nelements()); 
+  residual_ = y_ - thefit_ ;
   return true;
 }
@@ -435 +436 @@
   chisquared_ = fitter.getChi2();
 
-  residual_.resize();
-  residual_ =  y_;
-  fitter.residual(residual_,x_);
+//   residual_.resize();
+//   residual_ =  y_;
+//   fitter.residual(residual_,x_);
   // use fitter.residual(model=True) to get the model
   thefit_.resize(x_.nelements());
-  // model = data - residual
-//   fitter.residual(thefit_,x_,True);
-  thefit_ = y_ - residual_ ;
+  fitter.residual(thefit_,x_,True);
+  // residual = data - model
+  residual_.resize(x_.nelements()); 
+  residual_ = y_ - thefit_ ;
   return true;
 }