Changeset 7db52f1 in sasview for fittingview

Timestamp:

Oct 12, 2011 11:40:24 AM (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:

fittingview/src/sans/perspectives/fitting

Files:

• fit_thread.py (modified) (4 diffs)
• fitproblem.py (modified) (2 diffs)
• fitting.py (modified) (11 diffs)
• simfitpage.py (modified) (1 diff)

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

@@ -27 +27 @@
                  yieldtime  = 0.01,
                  worktime   = 0.01,
-                 ftol       = None):
+                 ftol       = None,
+                 reset_flag = False):
         CalcThread.__init__(self,completefn,
                  updatefn,
@@ -42 +43 @@
         #Relative error desired in the sum of squares.
         self.ftol = ftol
+        self.reset_flag = reset_flag
    
     def isquit(self):
@@ -63 +65 @@
             list_curr_thread = [] 
             list_ftol = []
+            list_reset_flag = []
             list_map_get_attr = []
             list_fit_function = []
@@ -71 +74 @@
                 list_curr_thread.append(None)
                 list_ftol.append(self.ftol)
+                list_reset_flag.append(self.reset_flag)
                 list_fit_function.append('fit')
                 list_map_get_attr.append(map_getattr)
             #from multiprocessing import Pool
             inputs = zip(list_map_get_attr,self.fitter, list_fit_function,
-                         list_handler, list_q, list_curr_thread,list_ftol)
+                         list_handler, list_q, list_curr_thread,list_ftol,
+                         list_reset_flag)
             result =  map(map_apply, inputs)
             self.complete(result=result,

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

@@ -595 +595 @@
         self.fit_data = None
         # original data: should not be modified
-        self.original_data = copy.deepcopy(data)
+        self.original_data = data
         # fit data: used for fit and can be modified for convenience
         self.fit_data = copy.deepcopy(data)
@@ -609 +609 @@
         return self.fit_data
     
+    def get_origin_data(self):
+        """
+        """
+        return self.original_data
+    
     def set_weight(self, is2d, flag=None):
         """

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

@@ -86 +86 @@
         ## Fit engine
         self._fit_engine = 'scipy'
+        self._gui_engine = None
         ## Relative error desired in the sum of squares (float); scipy only
         self.ftol = SANS_F_TOL
+        self.batch_reset_flag = True
         #List of selected data
         self.selected_data_list = []
@@ -705 +707 @@
             if value.get_scheduled() == 1:
                 fitproblem_count += 1
-                
+        self._gui_engine = self._return_engine_type()       
         self.fitproblem_count = fitproblem_count  
         if self._fit_engine == "park":
@@ -721 +723 @@
             fitter_list.append(sim_fitter) 
             is_single_fit = False
+            
 
         self.fitproblem_count = fitproblem_count  
@@ -818 +821 @@
                                     page_id=list_page_id,
                                     completefn=self._batch_fit_complete,
-                                    ftol=self.ftol)
+                                    ftol=self.ftol,
+                                    reset_flag=self.batch_reset_flag)
         else:
             # single fit: not batch and not simul fit 
@@ -1096 +1100 @@
                         msg += "Data %s and Model %s did not fit.\n" % (data_name, 
                                                                         model_name)
-                        #print msg
+                        print msg
                         wx.PostEvent(self.parent, StatusEvent(status=msg,
                                                               error="error",
@@ -1156 +1160 @@
                     flag = issubclass(data.__class__, Data2D)
                     if not flag:
-                        #print "Batch complete", len(res.theory), len(res.index)
                         self._complete1D(x=data.x, y=res.theory, page_id=pid, 
                                          elapsed=None, 
@@ -1163 +1166 @@
                                          toggle_mode_on=False, state=None, 
                                          data=data, update_chisqr=False, 
-                                         source='model')
+                                         source='fit')
                     else:
                         self._complete2D(image=data.data, data=data,
@@ -1173 +1176 @@
                                           toggle_mode_on=False, state=None, 
                                          update_chisqr=False, 
-                                         source='model')
+                                         source='fit')
                         
                     self.on_set_batch_result(page_id=pid, 
@@ -1204 +1207 @@
         cell.label = data.name
         cell.value = index
-        theory_data.id = wx.NewId()
-        theory_data.name = data.name + "[%s]" % str(model.__class__.__name__)
+        theory_data.id = str(page_id) + "model"
+        theory_data.name =  model.name + "[%s]" % str(model.__class__.__name__)
         cell.object = [data, theory_data]
         batch_outputs["Data"].append(cell)
@@ -1233 +1236 @@
         :param elapsed: time spent at the fitting level
         """
+       # reset fit_engine if changed by simul_fit
+        self._on_change_engine(self._gui_engine)
         result = result[0]
         self.fit_thread_list = {}
@@ -1450 +1455 @@
             caption = current_pg.window_caption
             self.page_finder[page_id].set_fit_tab_caption(caption=caption)
-           
+            new_plot.id =  str(page_id) + "model"
             self.page_finder[page_id].set_theory_data(data=new_plot, 
                                                       fid=data.id)

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

@@ -622 +622 @@
         self.btFit.SetToolTipString("Perform fit.")
         
-        text= "Hint: Park fitting engine will be selected automatically. \n"
+        text= "Hint: Park fitting engine will be used automatically. \n"
         #text+= "automatically for more than 2 combinations checked"
         text_hint = wx.StaticText(self,-1,text)