Changeset 610

Timestamp:

05/05/05 11:52:56 (20 years ago)

Author:

mar637

Message:

Fix for asap0017

File:

• branches/Release-1-fixes/src/SDFitter.cc (modified) (4 diffs)

branches/Release-1-fixes/src/SDFitter.cc

@@ -61 +61 @@
     delete funcs_[i]; funcs_[i] = 0;
   }
+  funcs_.resize(0,True);
   parameters_.resize();
   error_.resize();
@@ -278 +279 @@
   NonLinearFitLM<Float> fitter;
   CompoundFunction<Float> func;
-  const uInt n = funcs_.nelements();
+
+  uInt n = funcs_.nelements();
   for (uInt i=0; i<n; ++i) {
     func.addFunction(*funcs_[i]);
   }
+
   fitter.setFunction(func);
   fitter.setMaxIter(50+n*10);
   // Convergence criterium
   fitter.setCriteria(0.001);
-  
+
   // Fit
   Vector<Float> sigma(x_.nelements());
@@ -296 +299 @@
   parameters_.tovector(ps);
   setParameters(ps);
+
   error_.resize();
   error_ = fitter.errors();
-  
+
   chisquared_ = fitter.getChi2();
   
@@ -304 +308 @@
   residual_ =  y_;
   fitter.residual(residual_,x_);
-  
+
   // use fitter.residual(model=True) to get the model
   thefit_.resize(x_.nelements());