Changeset db427ec in sasview

Timestamp:

May 25, 2011 6:30:24 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

ead432b

Parents:

a3fc33d

Message:

more fix for fitstrings

File:

• park_integration/ScipyFitting.py (modified) (2 diffs)

park_integration/ScipyFitting.py

@@ -56 +56 @@
         self.iterations += 1
         result_param = zip(xrange(n), self.model.parameterset)
+        msg1 = ["[Iteration #: %s ]" % self.iterations]
+        msg3 = ["=== goodness of fit: %s ===" % (str(self.fitness))]
         if not self.is_mac:
-            msg1 = ["[Iteration #: %s ]" % self.iterations]
             msg2 = ["P%-3d  %s......|.....%s" % \
-                (p[0], p[1], p[1].value)\
+                (p[0], p[1], p[1].value)\
                   for p in result_param if p[1].name in self.param_list]
-            
-            msg3 = ["=== goodness of fit: %s ===" % (str(self.fitness))]
             msg =  msg1 + msg3 + msg2
-            msg = "\n".join(msg)
         else:
-            msg = ''
+            msg = msg1 + msg3
+        msg = "\n".join(msg)
         return msg
     
@@ -147 +146 @@
                          fitresult=result, curr_thread= self.curr_thread)
         try:
-                out, cov_x, _, mesg, success = optimize.leastsq(functor,
+            out, cov_x, _, mesg, success = optimize.leastsq(functor,
                                             model.get_params(self.param_list),
                                                     ftol=ftol,