Changeset 9e27de9 in sasview

Timestamp:

Feb 17, 2009 4:52:29 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:

d63ef2f

Parents:

3215d32

Message:

fix a small bug in simultaneous fit

Location:

sansview/perspectives/fitting

Files:

• fitproblem.py (modified) (1 diff)
• fitting.py (modified) (3 diffs)

sansview/perspectives/fitting/fitproblem.py

@@ -112 +112 @@
         """ return true or false if a problem as being schedule for fitting"""
         return self.schedule
-    
-    
+    def clear_model_param(self):
+        """
+        clear constraint info
+        """
+        self.list_param=[]

sansview/perspectives/fitting/fitting.py

@@ -255 +255 @@
                 list=value.get_model()
                 model=list[0]
-                #print "fitting",model.name,modelname
+                print "fitting",model.name,modelname, values
                 if model.name== modelname:
                     value.set_model_param(names,values)
@@ -491 +491 @@
                             return
                     # need to check this print "new model "
-                    """
+                    
                     new_model=Model(model)
                     param=value.get_model_param()
@@ -505 +505 @@
                             #new_model.set( exec "%s"%(param_nam) = param_value)
                             new_model.parameterset[ param_name].set( param_value )
-                    """      
-                    #self.fitter.set_model(new_model, self.fit_id, pars) 
+                        
+                    self.fitter.set_model(new_model, self.fit_id, pars) 
                     print "sim-->model",metadata,model,self.fit_id, pars
-                    self.fitter.set_model(Model(model), self.fit_id, pars) 
+                    #self.fitter.set_model(Model(model), self.fit_id, pars) 
                     self.fitter.set_data(metadata,self.fit_id,qmin,qmax,ymin,ymax)
                     print "sim---->value of problem",value.get_scheduled()
                     self.fitter.select_problem_for_fit(Uid=self.fit_id,value=value.get_scheduled())
                     self.fit_id += 1 
+                    value.clear_model_param()
                     #self.schedule_for_fit( 0,value) 
             except: