Changeset 6d90684 in sasmodels


Ignore:
Timestamp:
Aug 16, 2018 9:36:38 AM (6 years ago)
Author:
Torin Cooper-Bennun <torin.cooper-bennun@…>
Branches:
master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
bad3093
Parents:
86aa992
Message:

in beta mode, return P, not F2

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/product.py

    rc036ddb r6d90684  
    294294            #    } 
    295295            #lazy_pars = s_result, F1, F2, combined_scale 
    296             self.results = [F2, s_result] 
     296            self.results = [F2*volfrac/volume_avg, s_result] 
    297297            final_result = combined_scale*(F2 + (F1**2)*(s_result - 1)) + background 
    298298        else: 
Note: See TracChangeset for help on using the changeset viewer.