Changeset 7924042 in sasview

Timestamp:

Jul 30, 2008 10:10:55 AM (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:

8780e9a

Parents:

9855699

Message:

print added to fit miniview2

File:

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

park_integration/ParkFitting.py

@@ -49 +49 @@
     def __init__(self, sans_model):
         self.model = sans_model
+        print "ParkFitting:sans model",self.model
         sansp = sans_model.getParamList()
-       
+        print "ParkFitting: sans model parameter list",sansp
         parkp = [SansParameter(p,sans_model) for p in sansp]
+        print "ParkFitting: park model parameter ",parkp
         self.parameterset = park.ParameterSet(sans_model.name,pars=parkp)
         
     def eval(self,x):
-        print "eval",self.parameterset[0].value
+        print "eval",self.parameterset[0].value,self.parameterset[1].value
+        print "model run ",self.model.run(x)
         return self.model.run(x)
     
@@ -145 +148 @@
         create an assembly self.problem=  park.Assembly([(parkmodel,parkdata)])
         """
+        print "ParkFitting: In createproblem"
         mylist=[]
         listmodel=[]
@@ -152 +156 @@
             #wrap sans model
             parkmodel = Model(sansmodel)
+            print "ParkFitting: createproblem: just create a model",parkmodel.parameterset
             for p in parkmodel.parameterset:
                 #self.param_list.append(p._getname())
                 if p.isfixed() and p._getname()in self.paramList:
                     p.set([-numpy.inf,numpy.inf])
-                
+            
             Ldata=value.get_data()
             x,y,dy=self._concatenateData(Ldata)
@@ -162 +167 @@
             parkdata=Data(x,y,dy,None)
             couple=(parkmodel,parkdata)
+            print "Parkfitting: fitness",couple   
             mylist.append(couple)
         print "mylist",mylist
@@ -183 +189 @@
             @return result.cov: Covariance matrix
         """
+        #from numpy.linalg.linalg.LinAlgError import LinAlgError
         print "Parkfitting: fit method probably breaking just right before \
         call fit"
@@ -193 +200 @@
         localfit.ftol = 1e-8
         fitter = FitMC(localfit=localfit)
-        
-        result = fit.fit(self.problem,
+        try:
+            
+            result = fit.fit(self.problem,
                          fitter=fitter,
                          handler= fitresult.ConsoleUpdate(improvement_delta=0.1))
-        for p in result.parameters:
-            print "fit in park fitting", p.name, p.value
-        return result.fitness,result.pvec,result.cov
+          
+            for p in result.parameters:
+                print "fit in park fitting", p.name, p.value
+            return result.fitness,result.pvec,result.cov
+           
+        except :
+            raise
+            return
+