Changeset 87c722e in sasmodels

Timestamp:

Feb 13, 2015 4:37:09 PM (10 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:

• README.rst (modified) (1 diff)
• compare.py (modified) (2 diffs)
• sasmodels/bumps_model.py (modified) (6 diffs)
• sasmodels/dll.py (modified) (1 diff)
• sasmodels/sasview_model.py (modified) (1 diff)

README.rst

@@ -16 +16 @@
 rod-like shape.
 
-The data is loaded by sans.dataloader from the sasview package, so sasview
+The data is loaded by sas.dataloader from the sasview package, so sasview
 is needed to run the example.
 

compare.py

@@ -20 +20 @@
     modelname, pars = revert_model(modelname, pars)
     #print "new",sorted(pars.items())
-    sans = __import__('sans.models.'+modelname)
-    ModelClass = getattr(getattr(sans.models,modelname,None),modelname,None)
+    sas = __import__('sas.models.'+modelname)
+    ModelClass = getattr(getattr(sas.models,modelname,None),modelname,None)
     if ModelClass is None:
-        raise ValueError("could not find model %r in sans.models"%modelname)
+        raise ValueError("could not find model %r in sas.models"%modelname)
     model = ModelClass()
 
@@ -423 +423 @@
     return 'triaxial_ellipsoid', pars
 
+@model('sphpy')
+def spherepy():
+    pars = dict(
+        scale=1, background=0,
+        sld=6, solvent_sld=1,
+        radius=120,
+        radius_pd=.2, radius_pd_n=45,
+        )
+    return 'spherepy', pars
+
 @model('sph')
 def sphere():

sasmodels/bumps_model.py

@@ -46 +46 @@
     Load data using a sasview loader.
     """
-    from sans.dataloader.loader import Loader
+    from sas.dataloader.loader import Loader
     loader = Loader()
     data = loader.load(filename)
@@ -61 +61 @@
     """
 
-    from sans.dataloader.data_info import Data1D
+    from sas.dataloader.data_info import Data1D
 
     Iq = 100*np.ones_like(q)
@@ -79 +79 @@
     Resolution dq/q is 5%.
     """
-    from sans.dataloader.data_info import Data2D, Detector
+    from sas.dataloader.data_info import Data2D, Detector
 
     if qy is None:
@@ -123 +123 @@
     Add a beam stop of the given *radius*.  If *outer*, make an annulus.
     """
-    from sans.dataloader.manipulations import Ringcut
+    from sas.dataloader.manipulations import Ringcut
     if hasattr(data, 'qx_data'):
         data.mask = Ringcut(0, radius)(data)
@@ -138 +138 @@
     Select half of the data, either "right" or "left".
     """
-    from sans.dataloader.manipulations import Boxcut
+    from sas.dataloader.manipulations import Boxcut
     if half == 'right':
         data.mask += Boxcut(x_min=-np.inf, x_max=0.0, y_min=-np.inf, y_max=np.inf)(data)
@@ -149 +149 @@
     Chop the top off the data, above *max*.
     """
-    from sans.dataloader.manipulations import Boxcut
+    from sas.dataloader.manipulations import Boxcut
     data.mask += Boxcut(x_min=-np.inf, x_max=np.inf, y_min=-np.inf, y_max=max)(data)
 

sasmodels/dll.py

@@ -23 +23 @@
     #COMPILE = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s /link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s"
     COMPILE = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s /openmp /link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s"
-    #/MANIFESTFILE:build\temp.win32-2.7\Release\src\sans\models\c_extension\libigor\c_models.pyd.manifest
     #COMPILE = "gcc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %(source)s -o %(output)s -lm"
 else:

sasmodels/sasview_model.py

@@ -91 +91 @@
         self.output_unit = model.info.get("output_unit","cm^{-1}")
 
-        ## _persistency_dict is used by sans.perspectives.fitting.basepage
+        ## _persistency_dict is used by sas.perspectives.fitting.basepage
         ## to store dispersity reference.
         ## TODO: _persistency_dict to persistency_dict throughout sasview