Changeset cdd676e in sasmodels for explore/beta/sasfit_compare.py


Ignore:
Timestamp:
Jul 9, 2018 10:58:51 AM (6 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
502c7b8
Parents:
9f2216f
Message:

Update Yun's code to produce <F2> and P columns

File:
1 edited

Legend:

Unmodified
Added
Removed

  • explore/beta/sasfit_compare.py

    re262dd6 rcdd676e  
    446446    Q = data[0] 
    447447    F1 = data[1] 
     448    F2 = data[2] 
    448449    P = data[3] 
    449450    S = data[5] 
    450451    Seff = data[6] 
    451     target = Theory(Q=Q, F1=F1, P=P, S=S, Seff=Seff) 
     452    target = Theory(Q=Q, F1=F1, F2=F2, P=P, S=S, Seff=Seff) 
    452453    actual = sphere_r(Q, norm='yun', **pars) 
    453454    title = " ".join(("yun", "sphere", "10% dispersion 10% Vf")) 
    … …  
    457458    Q = data[0] 
    458459    F1 = data[1] 
     460    F2 = data[2] 
    459461    P = data[3] 
    460462    S = data[5] 
    461463    Seff = data[6] 
    462     target = Theory(Q=Q, F1=F1, P=P, S=S, Seff=Seff) 
     464    target = Theory(Q=Q, F1=F1, F2=F2, P=P, S=S, Seff=Seff) 
    463465    actual = sphere_r(Q, norm='yun', **pars) 
    464466    title = " ".join(("yun", "sphere", "15% dispersion 10% Vf")) 
Note: See TracChangeset for help on using the changeset viewer.