Changeset 2ed7de0 in sasmodels


Ignore:
Timestamp:
Mar 28, 2019 11:39:32 AM (4 months ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, ticket-1257-vesicle-product, ticket_1156, ticket_822_more_unit_tests
Children:
adb84f6
Parents:
6808ffe
Message:

don't need to ignore P@S parameters when checking for invalid

Location:
sasmodels
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/direct_model.py

    ra7db39fa r2ed7de0  
    7676    R_eff_type = int(pars.pop(RADIUS_MODE_ID, 1.0)) 
    7777    mesh = get_mesh(calculator.info, pars, dim=calculator.dim, mono=mono) 
    78     print("in call_Fq: pars", list(zip(*mesh))[0]) 
     78    #print("in call_Fq: pars", list(zip(*mesh))[0]) 
    7979    call_details, values, is_magnetic = make_kernel_args(calculator, mesh) 
    8080    #print("in call_Fq: values:", values) 
  • sasmodels/model_test.py

    rf691fac r2ed7de0  
    390390    invalid = [] 
    391391    for par in sorted(pars.keys()): 
    392         # special handling of R_eff mode, which is not a usual parameter 
     392        # Ignore the R_eff mode parameter when checking for valid parameters. 
     393        # It is an allowed parameter for a model even though it does not exist 
     394        # in the parameter table.  The call_Fq() function pops it from the 
     395        # parameter list and sends it directly to kernel.Fq(). 
    393396        if par == product.RADIUS_MODE_ID: 
    394             continue 
    395         if par == product.RADIUS_TYPE_ID: 
    396             continue 
    397         if par == product.STRUCTURE_MODE_ID: 
    398397            continue 
    399398        parts = par.split('_pd') 
  • sasmodels/models/sphere.py

    r6808ffe r2ed7de0  
    112112    [{"@S": "hardsphere",        # hard sphere structure factor 
    113113     "structure_factor_mode": 1, # decoupling approximation 
    114      "effective_radius_type": 1, 
     114     "radius_effective_mode": 1, 
    115115     # Currently have hardwired model_test to accept radius_effective 
    116116     "radius_effective": 27.0, # equivalent sphere 
  • sasmodels/product.py

    r0b8a1fc r2ed7de0  
    3939STRUCTURE_MODE_ID = "structure_factor_mode" 
    4040RADIUS_MODE_ID = "radius_effective_mode" 
    41 # rkh add this to pass to model_test 
    42 RADIUS_TYPE_ID = "effective_radius_type" 
    4341RADIUS_ID = "radius_effective" 
    4442VOLFRAC_ID = "volfraction" 
Note: See TracChangeset for help on using the changeset viewer.