Changeset 4a52223 in sasview for fittingview

Timestamp:

Oct 12, 2011 5:11:12 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:

ea8283d

Parents:

1363416

Message:

work on the firt result display

File:

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

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

@@ -1094 +1094 @@
                 for res in list_res:
                     model, data = res.inputs[0]
+                    correct_result = False
                     if model is not None and hasattr(model, "model"):
                         model = model.model
                     if data is not None and hasattr(data, "sans_data"):
                         data = data.sans_data
-                    if res.fitness is None or \
+                    is_data2d = issubclass(data.__class__, Data2D)
+                    #check consistency of arrays
+                    if not is_data2d:
+                        if len(res.theory) == len(res.index) and \
+                            len(res.index) == len(data.y):
+                            correct_result = True
+                    else:
+                        if len(res.theory)== len(res.index) and \
+                            len(res.index) == len(data.data):
+                            correct_result = True
+                    #get all fittable parameters of the current model
+                    param_list = model.getParamList()
+                    for param in model.getDispParamList():
+                        if not model.is_fittable(param) and \
+                            param in param_list:
+                            param_list.remove(param)       
+                    if not correct_result or res.fitness is None or \
                         not numpy.isfinite(res.fitness) or \
                         numpy.any(res.pvec == None) or not \
@@ -1110 +1127 @@
                         msg += "Data %s and Model %s did not fit.\n" % (data_name, 
                                                                         model_name)
+                        ERROR = numpy.NAN
+                        cell = BatchCell()
+                        cell.label = res.fitness
+                        cell.value = res.fitness
+                        batch_outputs["Chi2"].append(ERROR)
+                        for param in param_list:
+                            # save value of  fixed parameters
+                            if param not in batch_outputs.keys():
+                                batch_outputs[param] = []
+                            if param not in res.param_list:
+                                batch_outputs[str(param)].append(ERROR)
+                        for index  in range(len(res.param_list)):
+                            #save only fitted values
+                            batch_outputs[res.param_list[index]].append(ERROR)
+                            batch_inputs["error on %s" % res.param_list[index]].append(ERROR)
                     else:
                         cell = BatchCell()
@@ -1116 +1148 @@
                         batch_outputs["Chi2"].append(cell)
                         # add parameters to batch_results
-                        param_list = model.getParamList()
-                        for param in model.getDispParamList():
-                            if not model.is_fittable(param) and \
-                                param in param_list:
-                                param_list.remove(param)
                         for param in param_list:
                             # save value of  fixed parameters
@@ -1142 +1169 @@
                     fitproblem = self.page_finder[pid][data.id]
                     qmin, qmax = fitproblem.get_range()
-                    flag = issubclass(data.__class__, Data2D)
-                    if not flag:
-                        if len(res.theory) == len(res.index) and \
-                            len(res.index) == len(data.y):
-                            correct_result = True
+                   
+                    if correct_result:
+                        if not is_data2d:
                             self._complete1D(x=data.x, y=res.theory, page_id=pid, 
                                          elapsed=None, 
@@ -1154 +1179 @@
                                          data=data, update_chisqr=False, 
                                          source='fit')
-                            self.on_set_batch_result(page_id=pid, 
-                                             fid=data.id, 
-                                             batch_outputs=batch_outputs, 
-                                             batch_inputs=batch_inputs)
                         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:
-                        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,
@@ -1181 +1189 @@
                                          update_chisqr=False, 
                                          source='fit')
-                            self.on_set_batch_result(page_id=pid, 
+                    self.on_set_batch_result(page_id=pid, 
                                              fid=data.id, 
                                              batch_outputs=batch_outputs, 
                                              batch_inputs=batch_inputs)
-                        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)
-                    
+        
         wx.PostEvent(self.parent, StatusEvent(status=msg, error="error",
                                                               type="stop"))