Changeset 848193e in sasmodels

Timestamp:

May 10, 2016 12:42:16 PM (9 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

a5da1f2

Parents:

da7af35 (diff), 4e00c13 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pull request #4 from SasView?/dataloader_fix

Update sas.dataloader to sas.sascalc.dataloader

File:

• sasmodels/data.py (modified) (3 diffs)

sasmodels/data.py

@@ -53 +53 @@
     Add a beam stop of the given *radius*.  If *outer*, make an annulus.
     """
-    from sas.dataloader.manipulations import Ringcut
+    from sas.sascalc.dataloader.manipulations import Ringcut
     if hasattr(data, 'qx_data'):
         data.mask = Ringcut(0, radius)(data)
@@ -68 +68 @@
     Select half of the data, either "right" or "left".
     """
-    from sas.dataloader.manipulations import Boxcut
+    from sas.sascalc.dataloader.manipulations import Boxcut
     if half == 'right':
         data.mask += \
@@ -81 +81 @@
     Chop the top off the data, above *cutoff*.
     """
-    from sas.dataloader.manipulations import Boxcut
+    from sas.sascalc.dataloader.manipulations import Boxcut
     data.mask += \
         Boxcut(x_min=-np.inf, x_max=np.inf, y_min=-np.inf, y_max=cutoff)(data)