Changeset 2580 for trunk/src/STFitter.cpp

Timestamp:

06/28/12 14:22:10 (12 years ago)

Author:

ShinnosukeKawakami

Message:

hpc33 merged asap-trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/STFitter.cpp (modified) (4 diffs)

trunk/src/STFitter.cpp

@@ -379 +379 @@
 
   // 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;
@@ -396 +397 @@
   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());
   fitter.residual(thefit_,x_,True);
+  // residual = data - model
+  residual_.resize(x_.nelements()); 
+  residual_ = y_ - thefit_ ;
   return true;
 }
@@ -420 +424 @@
 
   // 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);
@@ -434 +439 @@
   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());
   fitter.residual(thefit_,x_,True);
+  // residual = data - model
+  residual_.resize(x_.nelements()); 
+  residual_ = y_ - thefit_ ;
   return true;
 }