Changeset ee5b04c in sasview for park_integration/ParkFitting.py

Timestamp:

Aug 11, 2008 3:57:21 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:

f44dbc7

Parents:

0eb801a

Message:

comment added

File:

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

park_integration/ParkFitting.py

@@ -141 +141 @@
         """
         self.fitArrangeList={}
-        
+        self.paramList=[]
         
     def createProblem(self):
@@ -204 +204 @@
         localfit.ftol = 1e-8
         fitter = FitMC(localfit=localfit)
-        try:
-            
-            result = fit.fit(self.problem,
-                         fitter=fitter,
-                         handler= fitresult.ConsoleUpdate(improvement_delta=0.1))
-          
+        
+        result = fit.fit(self.problem,
+                     fitter=fitter,
+                     handler= fitresult.ConsoleUpdate(improvement_delta=0.1))
+        print "ParkFitting: result",result
+        if result !=None:
             #for p in result.parameters:
             #    print "fit in park fitting", p.name, p.value,p.stderr
             return result.fitness,result.pvec,result.cov,result
-           
-        except :
-            raise
-            return
+        else:
+            raise ValueError, "SVD did not converge"
+            
+