Changeset 7643ba2 in sasview

Timestamp:

Oct 12, 2011 2:06:19 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:

da6fd1a

Parents:

7db52f1

Message:

make sure wrong batch result are displayed on the status bar

File:

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

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

@@ -1100 +1100 @@
                         msg += "Data %s and Model %s did not fit.\n" % (data_name, 
                                                                         model_name)
-                        print msg
-                        wx.PostEvent(self.parent, StatusEvent(status=msg,
-                                                              error="error",
-                                                              type="stop"))
                     else:
                         #Separate result in to data corresponding to each page
@@ -1156 +1152 @@
                     self.page_finder[pid][data.id].set_result(res)
                     fitproblem = self.page_finder[pid][data.id]
-                
                     qmin, qmax = fitproblem.get_range()
                     flag = issubclass(data.__class__, Data2D)
+                    correct_result = False
                     if not flag:
-                        self._complete1D(x=data.x, y=res.theory, page_id=pid, 
+                        if len(res.theory) == len(res.index) and \
+                            len(res.index) == len(data.y):
+                            correct_result = True
+                            self._complete1D(x=data.x, y=res.theory, page_id=pid, 
                                          elapsed=None, 
                                          index=res.index, model=model,
@@ -1167 +1166 @@
                                          data=data, update_chisqr=False, 
                                          source='fit')
+                        else:
+                            data_name = str(None)
+                            if data is not None:
+                                data_name = str(data.name)
+                            model_name = str(None)
+                            if model is not None:
+                                model_name = str(model.name)
+                            msg += "Data %s and Model %s did not fit.\n" % (data_name, 
+                                                                            model_name)
+                            
                     else:
-                        self._complete2D(image=data.data, data=data,
+                        if len(res.theory)== len(res.index) and \
+                            len(res.index) == len(data.data):
+                            correct_result = True
+                            self._complete2D(image=res.theory, data=data,
                                           model=model,
                                           page_id=pid,  elapsed=None, 
@@ -1177 +1189 @@
                                          update_chisqr=False, 
                                          source='fit')
-                        
-                    self.on_set_batch_result(page_id=pid, 
+                        else:
+                            data_name = str(None)
+                            if data is not None:
+                                data_name = str(data.name)
+                            model_name = str(None)
+                            if model is not None:
+                                model_name = str(model.name)
+                            msg += "Data %s and Model %s did not fit.\n" % (data_name, 
+                                                                            model_name)
+                            
+                    if correct_result : 
+                        self.on_set_batch_result(page_id=pid, 
                                              fid=data.id, 
                                              batch_outputs=batch_outputs, 
                                              batch_inputs=batch_inputs)
           
+        #print msg
+        wx.PostEvent(self.parent, StatusEvent(status=msg, error="error",
+                                                              type="stop"))
         wx.CallAfter(self.parent.on_set_batch_result,batch_outputs, 
                                             batch_inputs,
@@ -1207 +1232 @@
         cell.label = data.name
         cell.value = index
-        theory_data.id = str(page_id) + "model"
-        theory_data.name =  model.name + "[%s]" % str(model.__class__.__name__)
+        theory_data.id = wx.NewId()
+        theory_data.name = model.name + "[%s]" % str(model.__class__.__name__)
         cell.object = [data, theory_data]
         batch_outputs["Data"].append(cell)
@@ -1248 +1273 @@
             for uid in page_id:
                 res = result[index]
-                if res.fitness is not None or \
+                if res.fitness is None or \
                     not numpy.isfinite(res.fitness) or \
                     numpy.any(res.pvec == None) or \
@@ -1258 +1283 @@
                                          type="stop"))
                     self._update_fit_button(page_id)
-                cpage = self.fit_panel.get_page_by_id(uid)
-                # Make sure we got all results 
-                #(CallAfter is important to MAC)
-                wx.CallAfter(cpage.onsetValues, res.fitness, res.param_list, 
+                else:
+                    cpage = self.fit_panel.get_page_by_id(uid)
+                    # Make sure we got all results 
+                    #(CallAfter is important to MAC)
+                    wx.CallAfter(cpage.onsetValues, res.fitness, res.param_list, 
                              res.pvec, res.stderr)
-                index += 1
-                cpage._on_fit_complete()
-                if res.stderr == None:
-                    msg = "Fit Abort: "
-                else:
-                    msg = "Fitting: "
-                msg += "Completed!!!"
-                wx.PostEvent(self.parent, StatusEvent(status=msg))
+                    index += 1
+                    cpage._on_fit_complete()
+                    if res.stderr == None:
+                        msg = "Fit Abort: "
+                    else:
+                        msg = "Fitting: "
+                    msg += "Completed!!!"
+                    wx.PostEvent(self.parent, StatusEvent(status=msg))
         except ValueError:
                 raise
@@ -1455 +1481 @@
             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)