Changeset 940aca7 in sasview for park_integration/src/sans

Timestamp:

May 19, 2012 12:17:02 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

baa915c

Parents:

d225e32

Message:

Merge 2.1.1 into trunk

File:

• park_integration/src/sans/fit/ParkFitting.py (modified) (1 diff)

park_integration/src/sans/fit/ParkFitting.py

@@ -435 +435 @@
             if result is not None:
                 for p in result.parameters:
-                    if p.data.name == small_result.data.name:
+                    if p.data.name == small_result.data.name and \
+                            p.model.name == small_result.model.name:
                         small_result.index = m.data.idx
                         small_result.fitness = result.fitness