Changeset d2d6100 in sasmodels


Ignore:
Timestamp:
Jul 28, 2016 7:51:51 AM (7 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
20317b3
Parents:
7f1ee79
Message:

mark linear pearls and polymer micelle as double precision

Location:
sasmodels
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/core.py

    r0b03001 rd2d6100  
    6262    Return the list of available models on the model path. 
    6363    """ 
    64     KINDS = ("all", "py", "c", "double", "oriented", "magnetic") 
     64    KINDS = ("all", "py", "c", "double", "single", "1d", "2d", "nonmagnetic", "magnetic") 
    6565    if kind and kind not in KINDS: 
    6666        raise ValueError("kind not in "+", ".join(KINDS)) 
     
    8383    elif kind == "double" and not info.single: 
    8484        return True 
    85     elif kind == "oriented" and any(p.type=='orientation' for p in pars): 
     85    elif kind == "single" and info.single: 
     86        return True 
     87    elif kind == "2d" and any(p.type=='orientation' for p in pars): 
     88        return True 
     89    elif kind == "1d" and any(p.type!='orientation' for p in pars): 
    8690        return True 
    8791    elif kind == "magnetic" and any(p.type=='sld' for p in pars): 
     92        return True 
     93    elif kind == "nonmagnetic" and any(p.type!='sld' for p in pars): 
    8894        return True 
    8995    return False 
  • sasmodels/models/linear_pearls.py

    r42356c8 rd2d6100  
    6161    ] 
    6262# pylint: enable=bad-whitespace, line-too-long 
     63single=False 
    6364 
    6465source = ["linear_pearls.c"] 
  • sasmodels/models/polymer_micelle.py

    r42356c8 rd2d6100  
    5151# pylint: enable=bad-whitespace, line-too-long 
    5252 
     53single = False 
     54 
    5355source = ["lib/sph_j1c.c", "polymer_micelle_kernel.c"] 
    5456 
Note: See TracChangeset for help on using the changeset viewer.