Changeset 46c4ccb in sasview for fittingview/src/sans

Timestamp:

Oct 18, 2011 7:43:27 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:

bf39777

Parents:

fc1761b

Message:

fit 2 batch make sure theory has the same length as data before plotting residuals

File:

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

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

@@ -1125 +1125 @@
                             correct_result = True
                     else:
-                        if len(res.theory)== len(res.index[res.index]) and \
-                            len(res.index) == len(data.data):
-                            correct_result = True
+                        copy_data = deepcopy(data)
+                        new_theory = copy_data.data
+                        new_theory[res.index] = res.theory
+                        new_theory[res.index[res.index == False]] = 0
+                        #if len(res.theory)== len(res.index[res.index]) and \
+                        #len(res.index) == len(data.data[res.index]):
+                        correct_result = True
                     #get all fittable parameters of the current model
                     param_list = model.getParamList()
@@ -1200 +1204 @@
                                          source='fit')
                         else:
-                            self._complete2D(image=res.theory, data=data,
+                            self._complete2D(image=new_theory, data=data,
                                           model=model,
                                           page_id=pid,  elapsed=None,