Changeset 922497f in sasview

Timestamp:

Aug 29, 2011 3:15:43 PM (13 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:

59de3e43

Parents:

c832374d

Message:

fix simultaneous fit

Location:

fittingview/src/sans/perspectives/fitting

Files:

• fitting.py (modified) (7 diffs)
• simfitpage.py (modified) (3 diffs)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -638 +638 @@
                                 update_chisqr=update_chisqr)
             
-    def onFit(self, uid=None):
+    def onFit(self, uid):
         """
         Get series of data, model, associates parameters and range and send then
@@ -650 +650 @@
             if value.get_scheduled() == 1:
                 fitproblem_count += 1
-                
         ## if simultaneous fit change automatically the engine to park
         if fitproblem_count > 1:
@@ -659 +658 @@
         else:
             engineType = "Single Fit"
-        fitter_list = []
+        fitter_list = []        
+        sim_fitter = None     
+        if self.sim_page is not None and self.sim_page.uid == uid:
+            #simulatanous fit only one engine need to be created    
+            sim_fitter = Fit(self._fit_engine)  
+            fitter_list.append(sim_fitter) 
+        
         self.current_pg = None
         list_page_id = []
+        fit_id = 0
         for page_id, value in self.page_finder.iteritems():
             # For simulfit (uid give with None), do for-loop
@@ -678 +684 @@
                         name = str(element[1])
                         pars.append(name)
-                    #Set Engine  (model , data) related to the page on 
-                    self._fit_helper(value, pars, fitter_list)
+
+                    for fitproblem in  value.get_fit_problem():
+                        if sim_fitter is None:
+                            fitter = Fit(self._fit_engine)  
+                            self._fit_helper(fitproblem, pars, fitter, fit_id)
+                            fitter_list.append(fitter) 
+                        else:
+                            fitter = sim_fitter
+                            self._fit_helper(fitproblem, pars, fitter, fit_id)
+                        fit_id += 1
                     list_page_id.append(page_id)
                     current_page_id = page_id
+                    value.clear_model_param()
             except:
+                raise
                 msg= "%s error: %s" % (engineType, sys.exc_value)
                 wx.PostEvent(self.parent, StatusEvent(status=msg, info="error",
@@ -865 +881 @@
                 self.page_finder[uid].schedule_tofit(value)
                 
-    def _fit_helper(self, value, pars, fitter_list):
+    def _fit_helper(self, fitproblem, pars, fitter, fit_id):
         """
         Create and set fit engine with series of data and model
@@ -872 +888 @@
         :param value:  structure storing data mapped to their model, range etc..
         """
-        fit_id = 0
-        for fitproblem in  value.get_fit_problem():
-            fitter = Fit(self._fit_engine)
-            data = fitproblem.get_fit_data()
-            model = fitproblem.get_model()
-            smearer = fitproblem.get_smearer()
-            qmin, qmax = fitproblem.get_range()
-            #Extra list of parameters and their constraints
-            listOfConstraint = []
-            param = fitproblem.get_model_param()
-            if len(param) > 0:
-                for item in param:
-                    ## check if constraint
-                    if item[0] != None and item[1] != None:
-                        listOfConstraint.append((item[0],item[1]))
-            fitter.set_model(model, fit_id, pars, constraints=listOfConstraint)
-            fitter.set_data(data=data, id=fit_id, smearer=smearer, qmin=qmin, 
-                            qmax=qmax)
-            fitter.select_problem_for_fit(id=fit_id, value=1)
-            fitter_list.append(fitter)
-            fit_id += 1
-        value.clear_model_param()
+        data = fitproblem.get_fit_data()
+        model = fitproblem.get_model()
+        smearer = fitproblem.get_smearer()
+        qmin, qmax = fitproblem.get_range()
+        #Extra list of parameters and their constraints
+        listOfConstraint = []
+        param = fitproblem.get_model_param()
+        if len(param) > 0:
+            for item in param:
+                ## check if constraint
+                if item[0] != None and item[1] != None:
+                    listOfConstraint.append((item[0],item[1]))
+        fitter.set_model(model, fit_id, pars, constraints=listOfConstraint)
+        fitter.set_data(data=data, id=fit_id, smearer=smearer, qmin=qmin, 
+                        qmax=qmax)
+        fitter.select_problem_for_fit(id=fit_id, value=1)
+       
        
     def _onSelect(self,event):
@@ -1022 +1033 @@
         :param elapsed: time spent at the fitting level
         """
-        result = result[0] 
+        result = result[0]
         self.fit_thread_list = {}
         if page_id is None:

fittingview/src/sans/perspectives/fitting/simfitpage.py

@@ -52 +52 @@
         ##Font size
         self.SetWindowVariant(variant = FONT_VARIANT)
-        self.uid = None
+        self.uid = wx.NewId()
         self.parent = parent
         ## store page_finder
@@ -128 +128 @@
                 break
                 
-    def onFit(self,event):
+    def onFit(self, event):
         """
         signal for fitting
@@ -143 +143 @@
                 if item[0].GetValue():
                     self.manager.schedule_for_fit(value=1, uid=item[2]) 
-            self.manager.onFit(None)
+            self.manager.onFit(uid=self.uid)
         else:
             msg= "Select at least one model to fit "