Changeset 87c722e in sasmodels for sasmodels/bumps_model.py

Timestamp:

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

File:

• sasmodels/bumps_model.py (modified) (6 diffs)

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)