Changeset 6dccecc in sasmodels


Ignore:
Timestamp:
Mar 28, 2019 10:19:14 AM (6 months ago)
Author:
ajj
Branches:
master, ticket-1257-vesicle-product, ticket_1156, ticket_822_more_unit_tests
Children:
adb84f6
Parents:
a7db39fa (diff), a430f5f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'ticket_822_v5_unit_tests' of https://github.com/SasView/sasmodels into ticket_822_v5_unit_tests

Location:
sasmodels
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/sphere.py

    rfacb052 ra430f5f  
    9595    [{"scale": 1., "background": 0., "sld": 6., "sld_solvent": 1., 
    9696      "radius": 120., "radius_pd": 0.2, "radius_pd_n":45}, 
    97      0.2, 0.228843], 
    98     [{"radius": 120., "radius_pd": 0.2, "radius_pd_n":45}, 
    99      0.1, None, None, 120., None, 1.0], 
     97     0.2, 0.2288431], 
     98    [{"radius": 120., "radius_pd": 0.02, "radius_pd_n":45}, 
     99     0.2, 792.0646662454202, [1166737.0473152], 120.0, 7246723.820358589, 1.0], # the longer list here checks  F1, F2, R_eff, volume, volume_ratio = call_Fq(kernel, pars) 
     100    #          But note P(Q) = F2/volume,  F1 and F2 are vectors, for some reason only F2 needs square brackets 
     101    #          BUT what is scaling of F1 ???  At low Pd F2 ~ F1^2 ? 
     102   [{"radius": 120., "radius_pd": 0.2, "radius_pd_n":45}, 
     103     0.2, 1.233304061, [1850806.119736], 120.0, 8087664.1226, 1.0], # the longer list here checks  F1, F2, R_eff, volume, volume_ratio = call_Fq(kernel, pars) 
    100104    [{"@S": "hardsphere"}, 
    101        0.1, 0.7940350343881906], # Q=0.1 this is current value, not verified elsewhere yet 
     105       0.01, 55.881884232102124], # this is current value, not verified elsewhere yet 
     106    [{"@S": "hardsphere"}, 
     107       0.2, 0.14730859242492958], #  this is current value, not verified elsewhere yet 
     108    [{"@S": "hardsphere"}, 
     109       0.1, 0.7940350343811906], #  this is current value, not verified elsewhere yet 
    102110        [{"@S": "hardsphere",          # hard sphere structure factor 
    103111     "structure_factor_mode": 1,  # decoupling approximation 
  • sasmodels/direct_model.py

    rfacb052 ra7db39fa  
    5959    """ 
    6060    mesh = get_mesh(calculator.info, pars, dim=calculator.dim, mono=mono) 
    61     print("in call_kernel: pars:", list(zip(*mesh))[0]) 
     61    #print("in call_kernel: pars:", list(zip(*mesh))[0]) 
    6262    call_details, values, is_magnetic = make_kernel_args(calculator, mesh) 
    6363    #print("in call_kernel: values:", values) 
     
    118118        active = lambda name: True 
    119119 
    120     print("in get_mesh: pars:",[p.id for p in parameters.call_parameters]) 
     120    #print("in get_mesh: pars:",[p.id for p in parameters.call_parameters]) 
    121121    mesh = [_get_par_weights(p, values, active(p.name)) 
    122122            for p in parameters.call_parameters] 
  • sasmodels/model_test.py

    ra430f5f ra7db39fa  
    240240                    s_name = pars.pop('@S') 
    241241                    ps_test = [pars] + list(test[1:]) 
     242                    #print("PS TEST PARAMS!!!",ps_test) 
    242243                    # build the P@S model 
    243244                    s_info = load_model_info(s_name) 
    244                     #print("in run_all: s_info:", s_info) 
    245245                    ps_info = product.make_product_info(self.info, s_info) 
    246246                    ps_model = build_model(ps_info, dtype=self.dtype, 
    247247                                           platform=self.platform) 
    248248                    # run the tests 
     249                    self.info = ps_model.info 
     250                    #print("SELF.INFO PARAMS!!!",[p.id for p in self.info.parameters.call_parameters]) 
     251                    #print("PS MODEL PARAMETERS:",[p.id for p in ps_model.info.parameters.call_parameters]) 
    249252                    results.append(self.run_one(ps_model, ps_test)) 
    250253 
     
    397400        if par == product.STRUCTURE_MODE_ID: 
    398401            continue 
    399         if par == "radius_effective":    # test should not need this?? 
    400             continue 
    401402        parts = par.split('_pd') 
    402403        if len(parts) > 1 and parts[1] not in ("", "_n", "nsigma", "type"): 
Note: See TracChangeset for help on using the changeset viewer.