Changeset 1031 for trunk/python

Timestamp:

04/26/06 10:43:17 (19 years ago)

Author:

mar637

Message:

Fix for Ticket #31; I forgot to change this when I changed the return value of get_parameters

File:

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

trunk/python/asapfitter.py

@@ -180 +180 @@
         fixed = None
         params = None
-        
+
         if len(args) and isinstance(args[0],dict):
             kwargs = args[0]
@@ -305 +305 @@
         if rcParams['verbose']:
             print fpars
-        return {'params':cpars, 'fixed':cfixed}
+        return {'params':cpars, 'fixed':cfixed, 'formatted': fpars}
 
     def _format_pars(self, pars, fixed, area):
@@ -457 +457 @@
             if isinstance(components,int): cs = [components]
             if plotparms:
-                self._p.text(0.15,0.15,str(self.get_parameters()[2]),size=8)
+                self._p.text(0.15,0.15,str(self.get_parameters()['formatted']),size=8)
             n = len(self.components)
             self._p.palette(3)
@@ -506 +506 @@
         asaplog.push("Fitting:")
         for r in rows:
-            out = " Scan[%d] Beam[%d] IF[%d] Pol[%d] Cycle[%d]" %        (scan.getscan(r),scan.getbeam(r),scan.getif(r),scan.getpol(r), scan.getcycle(r))
+            out = " Scan[%d] Beam[%d] IF[%d] Pol[%d] Cycle[%d]" % (scan.getscan(r),scan.getbeam(r),scan.getif(r),scan.getpol(r), scan.getcycle(r))
             asaplog.push(out, False)
             self.x = scan._getabcissa(r)