Changeset 1228

Timestamp:

08/31/06 17:09:19 (18 years ago)

Author:

mar637

Message:

fix for Ticket #67. no reset of fixedpar_ on clear

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

@@ -100 +100 @@
 
         self.fitter.setexpression(self.fitfunc,n)
+        self.fitted = False
         return
 
@@ -136 +137 @@
                 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':

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

@@ -64 +64 @@
   funcs_.resize(0,True);
   parameters_.resize();
+  fixedpar_.resize();
   error_.resize();
   thefit_.resize();
@@ -208 +209 @@
         parameters_.resize(tmppar.nelements());
         if (tmppar.nelements() != fixedpar_.nelements()) {
-          fixedpar_.resize(tmppar.nelements());
-          fixedpar_ = False;
-        }
+            fixedpar_.resize(tmppar.nelements());
+            fixedpar_ = False;
+        }
     }
     if (dynamic_cast<Gaussian1D<Float>* >(funcs_[0]) != 0) {
@@ -227 +228 @@
         }
     }
+    // reset
+    if (params.size() == 0) {
+        parameters_.resize();
+        fixedpar_.resize();
+    }
     return true;
 }
@@ -236 +242 @@
     if (fixedpar_.nelements() > 0 && fixed.size() != fixedpar_.nelements())
         throw (AipsError("Number of mask elements inconsistent with function."));
+    if (fixedpar_.nelements() == 0) {
+        fixedpar_.resize(parameters_.nelements());
+        fixedpar_ = False;
+    }
     if (dynamic_cast<Gaussian1D<Float>* >(funcs_[0]) != 0) {
         uInt count = 0;
@@ -264 +274 @@
   Vector<Bool> out(parameters_.nelements());
   if (fixedpar_.nelements() == 0) {
-    out = False;
+    return std::vector<bool>();
     //throw (AipsError("No parameter mask set."));
   } else {