Changeset 05fb6d12 in sasview for fittingview/src/sans

Timestamp:

Oct 10, 2011 5:19:58 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:

e3f6ef5

Parents:

91a43d0

Message:

fixed fit one of complete fit problems

File:

• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (3 diffs)

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

@@ -802 +802 @@
         self._mac_sleep(0.2)
         ## perform single fit
-        if is_single_fit:
+        try:
+            page = self.fit_panel.get_page_by_id(uid)
+            batch_on = page.batch_on
+        except:
+            batch_on = False
+        # batch fit
+        if batch_on:
             calc_fit = FitThread(handler = handler,
                                     fn=fitter_list,
@@ -811 +817 @@
                                     completefn=self._single_fit_completed,
                                     ftol=self.ftol)
+        # single fit: not batch and not simul fit 
+        elif is_single_fit:
+            if self._fit_engine == "park":
+                calc_fit = FitThread(handler = handler,
+                                    fn=fitter_list,
+                                    pars=pars,
+                                    batch_inputs=batch_inputs,
+                                    batch_outputs=batch_outputs,
+                                    page_id=list_page_id,
+                                    completefn=self._simul_fit_completed,
+                                    ftol=self.ftol)
+            else:
+                calc_fit = FitThread(handler = handler,
+                                    fn=fitter_list,
+                                    pars=pars,
+                                    batch_inputs=batch_inputs,
+                                    batch_outputs=batch_outputs,
+                                    page_id=list_page_id,
+                                    completefn=self._single_fit_completed,
+                                    ftol=self.ftol)
+            
+        # simul fit
         else:
             current_page_id = self.sim_page.uid
@@ -1063 +1091 @@
                 batch_inputs["error on %s" % pars[index]] = []
             for res in result:
+                #Separate result in to data corresponding to each page
+                temp_pars = []
+                temp_res_param = []
+                # Park sorts the params by itself so that we must check 
+                # param name and resort it back as it was. No effects on Scipy.
+                if res.parameters != None:
+                    model = cpage.model
+                    for fid in self.page_finder[pid]:
+                        if fid != None:
+                            # Below works only for batch using one model
+                            model = self.page_finder[pid][fid].get_model()
+                            break
+                    for p in res.parameters:
+                        model_name, param_name = self.split_string(p.name)  
+                        if model.name == model_name:
+                            p_name= model.name+"."+param_name
+                            if p.name == p_name:      
+                                temp_res_param.append(p)
+                                temp_pars.append(param_name)
+                    res.parameters = temp_res_param
+                    pars = temp_pars
+                
                 model, data = res.inputs[0]
                 temp_model = model#.clone()