Changeset 108 for trunk

Timestamp:

12/01/04 10:59:21 (20 years ago)

Author:

mar637

Message:

added fixed parameters

File:

• trunk/src/SDFitter.cc (modified) (3 diffs)

trunk/src/SDFitter.cc

@@ -84 +84 @@
     SpectralEstimate estimator(n);
     estimator.setQ(5);
+    Int mn,mx;
+    mn = 0;
+    mx = m_.nelements()-1;
+    for (uInt i=0; i<m_.nelements();++i) {
+      if (m_[i]) {
+        mn = i;
+        break;
+      }
+    }
+    for (uInt j=m_.nelements()-1; j>=0;--j) {
+      if (m_[j]) {
+        mx = j;
+        break;
+      }
+    }
+    //mn = 0+x_.nelements()/10;
+    //mx = x_.nelements()-x_.nelements()/10;
+    estimator.setRegion(mn,mx);
     //estimator.setWindowing(True);
     SpectralList listGauss = estimator.estimate(x_, y_);
@@ -89 +107 @@
     parameters_.resize(n*3);
     uInt count = 0;
-    cout << "n = " << n << endl;
     for (uInt i=0; i<n;i++) {
         g = dynamic_cast<Gaussian1D<Float>* >(funcs_[i]);
@@ -242 +259 @@
 
 std::vector<bool> SDFitter::getFixedParameters() const {
-    if (fixedpar_.nelements() == 0)
-        throw (AipsError("No parameter mask set."));
-    Vector<Bool> out = fixedpar_;
-    std::vector<bool> stlout;
-    out.tovector(stlout);
-    return stlout;
+  Vector<Bool> out(parameters_.nelements());
+  if (fixedpar_.nelements() == 0) {
+    out = False;
+    //throw (AipsError("No parameter mask set."));
+  } else {
+    out = fixedpar_;
+  }
+  std::vector<bool> stlout;
+  out.tovector(stlout);
+  return stlout;
 }