Changeset 940aca7 in sasview for park_integration


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • park_integration/src/sans/fit/ParkFitting.py

    r06e7c26 r940aca7  
    435435            if result is not None: 
    436436                for p in result.parameters: 
    437                     if p.data.name == small_result.data.name: 
     437                    if p.data.name == small_result.data.name and \ 
     438                            p.model.name == small_result.model.name: 
    438439                        small_result.index = m.data.idx 
    439440                        small_result.fitness = result.fitness 
Note: See TracChangeset for help on using the changeset viewer.