Changeset 7db52f1 in sasview for park_integration

Timestamp:

Oct 12, 2011 1:40:24 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

7643ba2

Parents:

18253cd

Message:

now able to reset the model init param values in batch model

Location:

park_integration/src/sans/fit

Files:

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

park_integration/src/sans/fit/AbstractFitEngine.py

@@ -459 +459 @@
         #import thread
         self.model.set_params(self.paramlist, params)
-        
+        print "params", params
         self.true_res, theory = self.data.residuals(self.model.eval)
         self.theory = copy.deepcopy(theory)
@@ -548 +548 @@
         #Dictionnary of fitArrange element (fit problems)
         self.fit_arrange_dict = {}
-  
+        
     def set_model(self, model,  id,  pars=[], constraints=[], data=None):
         """
@@ -611 +611 @@
                 fitproblem.pars = pars
                 self.fit_arrange_dict[id] = fitproblem
-                
+                vals = []
+                for name in pars:
+                    vals.append(new_model.model.getParam(name))
+                self.fit_arrange_dict[id].vals = vals
         else:
             raise ValueError, "park_integration:missing parameters"
@@ -698 +701 @@
         self.data_list = []
         self.pars = []
+        self.vals = []
         #self.selected  is zero when this fit problem is not schedule to fit 
         #self.selected is 1 when schedule to fit 

park_integration/src/sans/fit/Fitting.py

@@ -50 +50 @@
             raise ValueError, "enter the keyword scipy or park"
 
-    def fit(self, q=None, handler=None, curr_thread=None, ftol=1.49012e-8):
+    def fit(self, q=None, handler=None, 
+                        curr_thread=None, 
+                        ftol=1.49012e-8,
+                        reset_flag=False):
         """Perform the fit """
         return self._engine.fit(q, handler, curr_thread=curr_thread,
-                                ftol=ftol)
+                                ftol=ftol, reset_flag=reset_flag)
      
     def set_model(self, model, id, pars=[], constraints=[], data=None):

park_integration/src/sans/fit/ParkFitting.py

@@ -338 +338 @@
         self.param_list = []
         
-    def create_assembly(self, curr_thread):
+    def create_assembly(self, curr_thread, reset_flag=False):
         """
         Extract sansmodel and sansdata from 
@@ -358 +358 @@
         for item in fitproblems:
             parkmodel = item.get_model()
+            if reset_flag:
+                # reset the initial value; useful for batch
+                for name in item.pars:
+                    ind = item.pars.index(name)
+                    parkmodel.model.setParam(name, item.vals[ind])
+            
             for p in parkmodel.parameterset:
                 ## does not allow status change for constraint parameters
@@ -374 +380 @@
         
   
-    def fit(self, q=None, handler=None, curr_thread=None, ftol=1.49012e-8):
+    def fit(self, q=None, handler=None, curr_thread=None, 
+                                        ftol=1.49012e-8, reset_flag=False):
         """
         Performs fit with park.fit module.It can  perform fit with one model
@@ -395 +402 @@
         
         """
-        self.create_assembly(curr_thread=curr_thread)
+        self.create_assembly(curr_thread=curr_thread, reset_flag=reset_flag)
         localfit = SansFitSimplex()
         localfit.ftol = ftol

park_integration/src/sans/fit/ScipyFitting.py

@@ -56 +56 @@
     #    return profile(self._fit, *args, **kw)
 
-    def fit(self, q=None, handler=None, curr_thread=None, ftol=1.49012e-8):
+    def fit(self, q=None, handler=None, curr_thread=None, 
+            ftol=1.49012e-8, reset_flag=False):
         """
         """
@@ -70 +71 @@
             raise RuntimeError, "No Assembly scheduled for Scipy fitting."
             return
-    
+        model = fitproblem[0].get_model()
+        if reset_flag:
+            # reset the initial value; useful for batch
+            for name in fitproblem[0].pars:
+                ind = fitproblem[0].pars.index(name)
+                model.model.setParam(name, fitproblem[0].vals[ind])
         listdata = []
-        model = fitproblem[0].get_model()
         listdata = fitproblem[0].get_data()
         # Concatenate dList set (contains one or more data)before fitting