Changes in / [b39bf3b:d8e81f7] in sasmodels


Ignore:
Location:
sasmodels
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/core.py

    r0b8a1fc r9562dd2  
    376376    # type: () -> None 
    377377    """Check that model load works""" 
     378    from .product import RADIUS_ID, VOLFRAC_ID, STRUCTURE_MODE_ID, RADIUS_MODE_ID 
    378379    #Test the the model produces the parameters that we would expect 
    379380    model = load_model("cylinder@hardsphere*sphere") 
    380381    actual = [p.name for p in model.info.parameters.kernel_parameters] 
    381     target = ("sld sld_solvent radius length theta phi" 
    382               " radius_effective volfraction " 
    383               " structure_factor_mode effective_radius_type" 
    384               " A_sld A_sld_solvent A_radius").split() 
     382    target = ["sld", "sld_solvent", "radius", "length", "theta", "phi", 
     383              RADIUS_ID, VOLFRAC_ID, STRUCTURE_MODE_ID, RADIUS_MODE_ID, 
     384              "A_sld", "A_sld_solvent", "A_radius"] 
    385385    assert target == actual, "%s != %s"%(target, actual) 
    386386 
  • sasmodels/direct_model.py

    rb39bf3b rb39bf3b  
    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

    rb39bf3b rb39bf3b  
    247247                                           platform=self.platform) 
    248248                    # run the tests 
     249<<<<<<< HEAD 
    249250                    #self.info = ps_model.info 
    250251                    #print("SELF.INFO PARAMS!!!",[p.id for p in self.info.parameters.call_parameters]) 
    251252                    #print("PS MODEL PARAMETERS:",[p.id for p in ps_model.info.parameters.call_parameters]) 
     253======= 
     254>>>>>>> 2ed7de04217c5103c5fd8d7c14e29e04923269d5 
    252255                    results.append(self.run_one(ps_model, ps_test)) 
    253256 
     
    394397    invalid = [] 
    395398    for par in sorted(pars.keys()): 
    396         # special handling of R_eff mode, which is not a usual parameter 
     399        # Ignore the R_eff mode parameter when checking for valid parameters. 
     400        # It is an allowed parameter for a model even though it does not exist 
     401        # in the parameter table.  The call_Fq() function pops it from the 
     402        # parameter list and sends it directly to kernel.Fq(). 
    397403        if par == product.RADIUS_MODE_ID: 
    398             continue 
    399         if par == product.RADIUS_TYPE_ID: 
    400             continue 
    401         if par == product.STRUCTURE_MODE_ID: 
    402404            continue 
    403405        parts = par.split('_pd') 
  • sasmodels/product.py

    rb39bf3b rb39bf3b  
    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.