Changeset 9c648c7 in sasview for park_integration

Timestamp:

Jan 22, 2009 2:29:59 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

50cbace

Parents:

fe060f7

Message:

reducing the start_points for parkfitting

Location:

park_integration

Files:

• ParkFitting.py (modified) (1 diff)
• ScipyFitting.py (modified) (4 diffs)

park_integration/ParkFitting.py

@@ -105 +105 @@
         
         # See `park.fitresult.FitHandler` for details.
-        fitter = FitMC(localfit=localfit)
+        fitter = FitMC(localfit=localfit, start_points=1)
         if handler == None:
             print "no handler"
             handler= fitresult.ConsoleUpdate(improvement_delta=0.1)
         print "park handler", handler
+       
+            
         result = fit.fit(self.problem,
                          fitter=fitter,

park_integration/ScipyFitting.py

@@ -59 +59 @@
         self.fitArrangeDict={}
         self.paramList=[]
+    #def fit(self, *args, **kw):
+    #    return profile(self._fit, *args, **kw)
+
     def fit(self ,handler=None, qmin=None, qmax=None):
         # Protect against simultanous fitting attempts
@@ -68 +71 @@
         fitproblem=[]
         for id ,fproblem in self.fitArrangeDict.iteritems():
-            print "ScipyFitting:fproblem.get_to_fit() ",fproblem.get_to_fit()
+            #print "ScipyFitting:fproblem.get_to_fit() ",fproblem.get_to_fit()
             if fproblem.get_to_fit()==1:
                 fitproblem.append(fproblem)
@@ -96 +99 @@
                 qmax= numpy.max(data.image) 
         functor= sansAssembly(self.paramList,model,data)
+        
+        
         out, cov_x, info, mesg, success = optimize.leastsq(functor,model.getParams(self.paramList), full_output=1, warning=True)
         chisqr = functor.chisq(out)
@@ -115 +120 @@
         
        
-              
-            
+def profile(fn, *args, **kw):
+    import cProfile, pstats, os
+    global call_result
+    def call():
+        global call_result
+        call_result = fn(*args, **kw)
+    cProfile.runctx('call()', dict(call=call), {}, 'profile.out')
+    stats = pstats.Stats('profile.out')
+    #stats.sort_stats('time')
+    stats.sort_stats('calls')
+    stats.print_stats()
+    os.unlink('profile.out')
+    return call_result
+