Changeset a3fc33d in sasview for park_integration

Timestamp:

May 25, 2011 5:36:47 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:

db427ec

Parents:

8433093

Message:

removed fit_string on MAC: 'cause shown a problem on MAC

File:

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

park_integration/ScipyFitting.py

@@ -14 +14 @@
 from sans.fit.AbstractFitEngine import SansAssembly
 from sans.fit.AbstractFitEngine import FitAbort
-
+IS_MAC = True
+if sys.platform.count("win32") > 0:
+    IS_MAC = False
+    
 class fitresult(object):
     """
@@ -30 +33 @@
         self.stderr = None
         self.parameters = None
+        self.is_mac = IS_MAC
         self.model = model
         self.param_list = param_list
@@ -52 +56 @@
         self.iterations += 1
         result_param = zip(xrange(n), self.model.parameterset)
-        msg1 = ["[Iteration #: %s ]" % self.iterations]
-        msg2 = ["P%-3d  %s......|.....%s" % \
-                (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
-        return "\n".join(msg)
+        if not self.is_mac:
+            msg1 = ["[Iteration #: %s ]" % self.iterations]
+            msg2 = ["P%-3d  %s......|.....%s" % \
+                (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 = ''
+        return msg
     
     def print_summary(self):