Changeset 464fce54 in sasview for sansview/perspectives/fitting

Timestamp:

Nov 16, 2009 12:52:30 PM (15 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:

255306e

Parents:

fd6b789

Message:

change fiting tu use the new set_model function declaration

File:

• sansview/perspectives/fitting/fitting.py (modified) (4 diffs)

sansview/perspectives/fitting/fitting.py

@@ -472 +472 @@
                 wx.PostEvent(self.parent, StatusEvent(status= msg ))
                 return 
+            
         #Do the simultaneous fit
         try:
@@ -508 +509 @@
             wx.PostEvent(self.parent, StatusEvent(status= msg ,type="stop"))
             return 
+        
+        
     def ready_fit(self):
         """
@@ -608 +611 @@
         #Create list of parameters for fitting used
         templist=[]
-        pars=pars
+       
         try:
-            ## create a park model and reset parameter value if constraint
-            ## is given
-            new_model = Model(model)
+            #Extra list of parameters and their constraints
+            listOfConstraint= []
+            
             param = value.get_model_param()
             if len(param)>0:
                 for item in param:
-                    param_value = item[1]
-                    param_name = item[0]
                     ## check if constraint
-                    if param_value !=None and param_name != None:
-                        new_model.parameterset[ param_name].set( param_value )
-            
+                    if item[0] !=None and item[1] != None:
+                        listOfConstraint.append((item[0],item[1]))
+                   
             #Do the single fit
-            self.fitter.set_model(new_model, self.fit_id, pars)
+            self.fitter.set_model(model, self.fit_id,
+                                   pars,constraints = listOfConstraint)
             
             self.fitter.set_data(data=metadata,Uid=self.fit_id,
@@ -634 +636 @@
             msg= title +" error: %s" % sys.exc_value
             wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
-            return
+           
        
     def _onSelect(self,event):