Changeset 1924 for branches/polybatch/src/STFitter.cpp

Timestamp:

09/14/10 12:17:16 (14 years ago)

Author:

Malte Marquarding

Message:

Ticket #206: use STFitEntry as return objetc instead of pointer wrnagling.

File:

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

branches/polybatch/src/STFitter.cpp

@@ -142 +142 @@
     if (ncomp < 1) throw (AipsError("Need at least one gaussian to fit."));
     funcs_.resize(ncomp);
+    funcnames_.clear();
+    funccomponents_.clear();
     for (Int k=0; k<ncomp; ++k) {
       funcs_[k] = new Gaussian1D<Float>();
+      funcnames_.push_back(expr);
+      funccomponents_.push_back(3);
     }
   } else if (expr == "poly") {
     funcs_.resize(1);
+    funcnames_.clear();
+    funccomponents_.clear();
     funcs_[0] = new Polynomial<Float>(ncomp);
+      funcnames_.push_back(expr);
+      funccomponents_.push_back(ncomp);
   } else if (expr == "lorentz") {
     if (ncomp < 1) throw (AipsError("Need at least one lorentzian to fit."));
     funcs_.resize(ncomp);
+    funcnames_.clear();
+    funccomponents_.clear();
     for (Int k=0; k<ncomp; ++k) {
       funcs_[k] = new Lorentzian1D<Float>();
+      funcnames_.push_back(expr);
+      funccomponents_.push_back(3);
     }
   } else {
@@ -409 +421 @@
 }
 
+STFitEntry Fitter::getFitEntry() const
+{
+  STFitEntry fit;
+  fit.setParameters(getParameters());
+  fit.setErrors(getErrors());
+  fit.setComponents(funccomponents_);
+  fit.setFunctions(funcnames_);
+  fit.setParmasks(getFixedParameters());
+  return fit;
+}