Changeset d9dc518 in sasview

Timestamp:

Aug 7, 2009 11:50:51 PM (15 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

7f81665

Parents:

ecc58e72

Message:

park_integration: remove profiling from committed code. remove non-standard setup default.

Location:

park_integration

Files:

• ParkFitting.py (modified) (1 diff)
• ScipyFitting.py (modified) (1 diff)
• setup.py (modified) (1 diff)

park_integration/ParkFitting.py

@@ -87 +87 @@
         self.problem =  park.Assembly(mylist)
         
-    def fit(self, *args, **kw):
-        return profile(self._fit, *args, **kw)
     
-    def _fit(self,handler=None, curr_thread= None):
+    def fit(self,handler=None, curr_thread= None):
         """
             Performs fit with park.fit module.It can  perform fit with one model

park_integration/ScipyFitting.py

@@ -58 +58 @@
         self.fitArrangeDict={}
         self.paramList=[]
-    def fit(self, *args, **kw):
-        return profile(self._fit, *args, **kw)
+    #def fit(self, *args, **kw):
+    #    return profile(self._fit, *args, **kw)
 
-    def _fit(self ,handler=None,curr_thread= None):
+    def fit(self ,handler=None,curr_thread= None):
        
         fitproblem=[]

park_integration/setup.py

@@ -3 +3 @@
 """
 
-import sys
-import os
-if len(sys.argv) == 1:
-    sys.argv.append('install')
 
 # Then build and install the modules