Changeset 1221

Timestamp:

08/31/06 11:10:17 (18 years ago)

Author:

mar637

Message:

Fix for ticket #65, fixed parameter issues. This was a problem with mask=!fixed in the fitter. Also, each fit reset the fixed parameters

Location:

tags/Release2.1.0b

Files:

• python/asapfitter.py (modified) (2 diffs)
• src/STFitter.cpp (modified) (5 diffs)

tags/Release2.1.0b/python/asapfitter.py

@@ -136 +136 @@
                 out = "Scan[%d] Beam[%d] IF[%d] Pol[%d] Cycle[%d]" % (self.data.getscan(i),self.data.getbeam(i),self.data.getif(i),self.data.getpol(i), self.data.getcycle(i))
                 asaplog.push(out,False)
+        print self.mask
         self.fitter.setdata(self.x, self.y, self.mask)
         if self.fitfunc == 'gauss':
@@ -224 +225 @@
         Set the Parameters of a 'Gaussian' component, set with set_function.
         Parameters:
-            peak, centre, fhwm:  The gaussian parameters
+            peak, centre, fwhm:  The gaussian parameters
             peakfixed,
             centerfixed,

tags/Release2.1.0b/src/STFitter.cpp

@@ -205 +205 @@
     if (parameters_.nelements() > 0 && tmppar.nelements() != parameters_.nelements())
         throw (AipsError("Number of parameters inconsistent with function."));
-    if (parameters_.nelements() == 0)
+    if (parameters_.nelements() == 0) {
         parameters_.resize(tmppar.nelements());
-        fixedpar_.resize(tmppar.nelements());
-        fixedpar_ = False;
+        if (tmppar.nelements() != fixedpar_.nelements()) {
+          fixedpar_.resize(tmppar.nelements());
+          fixedpar_ = False;
+        }
+    }
     if (dynamic_cast<Gaussian1D<Float>* >(funcs_[0]) != 0) {
         uInt count = 0;
@@ -229 +232 @@
 bool Fitter::setFixedParameters(std::vector<bool> fixed)
 {
-    Vector<Bool> tmp(fixed);
     if (funcs_.nelements() == 0)
         throw (AipsError("Function not yet set."));
-    if (fixedpar_.nelements() > 0 && tmp.nelements() != fixedpar_.nelements())
+    if (fixedpar_.nelements() > 0 && fixed.size() != fixedpar_.nelements())
         throw (AipsError("Number of mask elements inconsistent with function."));
     if (dynamic_cast<Gaussian1D<Float>* >(funcs_[0]) != 0) {
@@ -238 +240 @@
         for (uInt j=0; j < funcs_.nelements(); ++j) {
             for (uInt i=0; i < funcs_[j]->nparameters(); ++i) {
-                funcs_[j]->mask(i) = !tmp[count];
-                fixedpar_[count] = !tmp[count];
+                funcs_[j]->mask(i) = !fixed[count];
+                fixedpar_[count] = fixed[count];
                 ++count;
             }
@@ -245 +247 @@
     } else if (dynamic_cast<Polynomial<Float>* >(funcs_[0]) != 0) {
         for (uInt i=0; i < funcs_[0]->nparameters(); ++i) {
-            fixedpar_[i] = tmp[i];
-            funcs_[0]->mask(i) =  tmp[i];
+            fixedpar_[i] = fixed[i];
+            funcs_[0]->mask(i) =  !fixed[i];
         }
     }
-    //fixedpar_ = !tmpmsk;
     return true;
 }
@@ -312 +313 @@
   residual_ =  y_;
   fitter.residual(residual_,x_);
-
   // use fitter.residual(model=True) to get the model
   thefit_.resize(x_.nelements());