Changeset 87c722e in sasmodels


Ignore:
Timestamp:
Feb 13, 2015 4:37:09 PM (8 years ago)
Author:
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:
f5b9a6b
Parents:
be802cb
Message:

use sas instead of sans

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • README.rst

    r5d3d7b4 r87c722e  
    1616rod-like shape. 
    1717 
    18 The data is loaded by sans.dataloader from the sasview package, so sasview 
     18The data is loaded by sas.dataloader from the sasview package, so sasview 
    1919is needed to run the example. 
    2020 
  • compare.py

    r216a9e1 r87c722e  
    2020    modelname, pars = revert_model(modelname, pars) 
    2121    #print "new",sorted(pars.items()) 
    22     sans = __import__('sans.models.'+modelname) 
    23     ModelClass = getattr(getattr(sans.models,modelname,None),modelname,None) 
     22    sas = __import__('sas.models.'+modelname) 
     23    ModelClass = getattr(getattr(sas.models,modelname,None),modelname,None) 
    2424    if ModelClass is None: 
    25         raise ValueError("could not find model %r in sans.models"%modelname) 
     25        raise ValueError("could not find model %r in sas.models"%modelname) 
    2626    model = ModelClass() 
    2727 
     
    423423    return 'triaxial_ellipsoid', pars 
    424424 
     425@model('sphpy') 
     426def spherepy(): 
     427    pars = dict( 
     428        scale=1, background=0, 
     429        sld=6, solvent_sld=1, 
     430        radius=120, 
     431        radius_pd=.2, radius_pd_n=45, 
     432        ) 
     433    return 'spherepy', pars 
     434 
    425435@model('sph') 
    426436def sphere(): 
  • sasmodels/bumps_model.py

    r31819c5 r87c722e  
    4646    Load data using a sasview loader. 
    4747    """ 
    48     from sans.dataloader.loader import Loader 
     48    from sas.dataloader.loader import Loader 
    4949    loader = Loader() 
    5050    data = loader.load(filename) 
     
    6161    """ 
    6262 
    63     from sans.dataloader.data_info import Data1D 
     63    from sas.dataloader.data_info import Data1D 
    6464 
    6565    Iq = 100*np.ones_like(q) 
     
    7979    Resolution dq/q is 5%. 
    8080    """ 
    81     from sans.dataloader.data_info import Data2D, Detector 
     81    from sas.dataloader.data_info import Data2D, Detector 
    8282 
    8383    if qy is None: 
     
    123123    Add a beam stop of the given *radius*.  If *outer*, make an annulus. 
    124124    """ 
    125     from sans.dataloader.manipulations import Ringcut 
     125    from sas.dataloader.manipulations import Ringcut 
    126126    if hasattr(data, 'qx_data'): 
    127127        data.mask = Ringcut(0, radius)(data) 
     
    138138    Select half of the data, either "right" or "left". 
    139139    """ 
    140     from sans.dataloader.manipulations import Boxcut 
     140    from sas.dataloader.manipulations import Boxcut 
    141141    if half == 'right': 
    142142        data.mask += Boxcut(x_min=-np.inf, x_max=0.0, y_min=-np.inf, y_max=np.inf)(data) 
     
    149149    Chop the top off the data, above *max*. 
    150150    """ 
    151     from sans.dataloader.manipulations import Boxcut 
     151    from sas.dataloader.manipulations import Boxcut 
    152152    data.mask += Boxcut(x_min=-np.inf, x_max=np.inf, y_min=-np.inf, y_max=max)(data) 
    153153 
  • sasmodels/dll.py

    rdf4dc86 r87c722e  
    2323    #COMPILE = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s /link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s" 
    2424    COMPILE = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s /openmp /link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s" 
    25     #/MANIFESTFILE:build\temp.win32-2.7\Release\src\sans\models\c_extension\libigor\c_models.pyd.manifest 
    2625    #COMPILE = "gcc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %(source)s -o %(output)s -lm" 
    2726else: 
  • sasmodels/sasview_model.py

    r87985ca r87c722e  
    9191        self.output_unit = model.info.get("output_unit","cm^{-1}") 
    9292 
    93         ## _persistency_dict is used by sans.perspectives.fitting.basepage 
     93        ## _persistency_dict is used by sas.perspectives.fitting.basepage 
    9494        ## to store dispersity reference. 
    9595        ## TODO: _persistency_dict to persistency_dict throughout sasview 
Note: See TracChangeset for help on using the changeset viewer.