Changeset 943 for trunk/python

Timestamp:

03/30/06 15:37:30 (19 years ago)

Author:

mar637

Message:

fixed a couple of variable mix ups

File:

• trunk/python/asapfitter.py (modified) (2 diffs)

trunk/python/asapfitter.py

@@ -130 +130 @@
                 from asap import asaplog
                 asaplog.push("Fitting:")
-                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))
+                i = row
+                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)
         self.fitter.setdata(self.x, self.y, self.mask)
@@ -292 +293 @@
         """
         pars = self.fitter.getestimate()
+        fixed = self.fitter.getfixedparameters()
         if rcParams['verbose']:
-            print self._format_pars(pars)
+            print self._format_pars(pars,fixed)
         return pars