Changes in / [0ac3db5:a006b63] in sasmodels


Ignore:
Location:
sasmodels
Files:
5 added
3 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/generate.py

    ra503bfd r3271e20  
    722722        parameters = COMMON_PARAMETERS + kernel_module.parameters, 
    723723        source = getattr(kernel_module, 'source', []), 
     724        oldname = kernel_module.oldname, 
     725        oldpars = kernel_module.oldpars, 
    724726        ) 
    725727    # Fill in attributes which default to None 
  • sasmodels/models/cylinder.py

    ra503bfd r5428233  
    4343.. figure:: img/orientation2.jpg 
    4444 
    45     Examples of the angles for oriented pp against the detector plane. 
     45    Examples of the angles for oriented cylinders against the detector plane. 
    4646 
    4747NB: The 2nd virial coefficient of the cylinder is calculated based on the 
     
    113113title = "Right circular cylinder with uniform scattering length density." 
    114114description = """ 
    115      P(q)= 2*(sld - solvent_sld)*V*sin(qLcos(alpha/2)) 
    116             /[qLcos(alpha/2)]*J1(qRsin(alpha/2))/[qRsin(alpha)] 
     115     f(q,alpha) = 2*(sld - solvent_sld)*V*sin(qLcos(alpha/2)) 
     116                /[qLcos(alpha/2)]*J1(qRsin(alpha/2))/[qRsin(alpha)] 
    117117 
    118             P(q,alpha)= scale/V*f(q)^(2)+background 
     118            P(q,alpha)= scale/V*f(q,alpha)^(2)+background 
    119119            V: Volume of the cylinder 
    120120            R: Radius of the cylinder 
     
    125125            :the ouput is P(q)=scale/V*integral 
    126126            from pi/2 to zero of... 
    127             f(q)^(2)*sin(alpha)*dalpha + background 
     127            f(q,alpha)^(2)*sin(alpha)*dalpha + background 
    128128""" 
    129129 
     
    169169oldpars=dict(theta='cyl_theta', phi='cyl_phi', sld='sldCyl', solvent_sld='sldSolv') 
    170170 
     171 
     172# test values: 
     173# [ 
     174#   [ {parameters}, q, I(q)], 
     175#   [ {parameters}, [q], [I(q)] ], 
     176#   [ {parameters}, [q1, q2, ...], [I(q1), I(q2), ...]], 
     177 
     178#   [ {parameters}, (qx, qy), I(qx, Iqy)], 
     179#   [ {parameters}, [(qx1, qy1), (qx2, qy2), ...], [I(qx1,qy1), I(qx2,qy2), ...], 
     180#   ... 
     181# ] 
     182# Precision defaults to 7 digits (relative) for single, 14 for double 
     183# May want a limited precision version that checks for 8-n or 15-n digits respectively 
     184tests = [ 
     185    [{},  0.2, 0.041761386790780453], 
     186    [{'theta':10.0, 'phi':10.0}, [0.2], [0.041761386790780453]], 
     187    [{'theta':10.0, 'phi':10.0}, (0.2, 2.5), 0.038176446608393366], 
     188    [{'theta':10.0, 'phi':10.0}, [(0.2, 2.5)], [0.038176446608393366]], 
     189    ] 
     190 
  • sasmodels/sasview_model.py

    r250fa25 r0a82216  
    3232 
    3333 
    34 def make_class(kernel_module, dtype='single'): 
     34def make_class(kernel_module, dtype='single', namestyle='name'): 
    3535    """ 
    3636    Load the sasview model defined in *kernel_module*. 
    3737 
    3838    Returns a class that can be used directly as a sasview model. 
     39 
     40    Defaults to using the new name for a model. Setting namestyle='name' 
     41    will produce a class with a name compatible with SasView 
    3942    """ 
    4043    model =  load_model(kernel_module, dtype=dtype) 
     
    4245        SasviewModel.__init__(self, model) 
    4346    attrs = dict(__init__=__init__) 
    44     ConstructedModel = type(model.info['name'],  (SasviewModel,), attrs) 
     47    ConstructedModel = type(model.info[namestyle],  (SasviewModel,), attrs) 
    4548    return ConstructedModel 
    4649 
     
    5457 
    5558        self.name = model.info['name'] 
     59        self.oldname = model.info['oldname'] 
    5660        self.description = model.info['description'] 
    5761        self.category = None 
Note: See TracChangeset for help on using the changeset viewer.