Changeset eb4f2fd in sasview for fittingview/src/sans

Timestamp:

Oct 5, 2011 4:13:00 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:

dcc93e4

Parents:

d91d2c9

Message:

make sure the curve plotted is correct

Location:

fittingview/src/sans/perspectives/fitting

Files:

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

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

@@ -580 +580 @@
         self.theory_data = copy.deepcopy(data)
         
-  
-         
     def get_theory_data(self):
         """

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

@@ -1060 +1060 @@
                 batch_inputs["error on %s" % pars[index]] = []
             for res in result:
+                model, data = res.inputs[0]
+                temp_model = model.clone()
                 if res is None:
                     null_value = numpy.nan
@@ -1072 +1074 @@
                         item = null_value
                         batch_inputs["error on %s" % pars[index]].append(item)
+                        """
+                        if pars[index] in model.getParamList():
+                            model.setParam(pars[index], res.pvec[index])
+                            """
                 else:
                     from sans.guiframe.data_processor import BatchCell
@@ -1082 +1088 @@
                         item = res.stderr[index]
                         batch_inputs["error on %s" % pars[index]].append(item)
-                
-               
+                        if pars[index] in temp_model.getParamList():
+                            temp_model.setParam(pars[index], res.pvec[index])
+                        
                 self.page_finder[pid].set_batch_result(batch_inputs=batch_inputs,
                                                  batch_outputs=batch_outputs)   
                 cpage = self.fit_panel.get_page_by_id(pid)
                 cpage._on_fit_complete()
-                model, data = res.inputs[0]
                 self.page_finder[pid][data.id].set_result(res)
                 fitproblem = self.page_finder[pid][data.id]
-                smearer = fitproblem.get_smearer()
+                
+               
+                from sans.models.qsmearing import smear_selection
+                #smearer = fitproblem.get_smearer()
+                smearer = smear_selection(data, temp_model)
                 qmin, qmax = fitproblem.get_range()
                 weight = fitproblem.get_weight()
                 flag = issubclass(data.__class__, Data2D)
-                self.draw_model(model=model,
+                self.draw_model(model=temp_model,
                                   page_id=pid, 
                                   data=data, 
@@ -1131 +1141 @@
         theory_data.name = data.name + "[%s]" % str(model.__class__.__name__)
         cell.object = [data, theory_data]
-        
         batch_outputs["Data"].append(cell)
         for key, value in data.meta_data.iteritems():
@@ -1449 +1458 @@
             current_pg = self.fit_panel.get_page_by_id(page_id)
             title = new_plot.title
-            wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
+            batch_on = self.fit_panel.get_page_by_id(page_id).batch_on
+            if not batch_on:
+                wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
                                             title=str(title)))
             caption = current_pg.window_caption
             self.page_finder[page_id].set_fit_tab_caption(caption=caption)
+            
             self.page_finder[page_id].set_theory_data(data=new_plot, 
                                                       fid=data.id)
@@ -1680 +1692 @@
                 dy[dy==0] = 1
             fn = data_copy.y[index] 
+            
             theory_data = self.page_finder[page_id].get_theory_data(fid=data_copy.id)
             if theory_data== None:
@@ -1691 +1704 @@
         # get chisqr only w/finite
         chisqr = numpy.average(residuals * residuals)
+        
         self._plot_residuals(page_id=page_id, data=data_copy, 
                              fid=fid,
@@ -1809 +1823 @@
         event = BatchDrawEvent(page_id=page_id , 
                            batch_on=batch_on,
+                           fid=fid,
                            batch_outputs=batch_outputs,
                            batch_inputs=batch_inputs,
@@ -1820 +1835 @@
         deplay batch result
         """
+        fid = event.fid
         page_id = event.page_id
         batch_on = event.batch_on
@@ -1825 +1841 @@
         batch_outputs = event.batch_outputs
         batch_inputs = event.batch_inputs
-        if flag and batch_on:
+        if flag and batch_on and fid is not None:
             self.parent.on_set_batch_result(data_outputs=batch_outputs, 
                                             data_inputs=batch_inputs,