Changeset 84f3398 in sasmodels for sasmodels/resolution.py

Timestamp:

Dec 19, 2016 5:24:58 AM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c, f1ec7002

Parents:

cdb867f (diff), b397165 (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.

git-author:

jhbakker <j.h.bakker@…> (12/19/16 05:24:58)

git-committer:

GitHub <noreply@…> (12/19/16 05:24:58)

Message:

Merge pull request #20 from SasView?/revert-19-Jurtest2

Revert "Jurtest2"

File:

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

sasmodels/resolution.py

@@ -9 +9 @@
 from numpy import sqrt, log, log10, exp, pi  # type: ignore
 import numpy as np  # type: ignore
-
-from sasmodels import sesans
-from sasmodels.sesans import SesansTransform as SesansTransform
 
 __all__ = ["Resolution", "Perfect1D", "Pinhole1D", "Slit1D",
@@ -46 +43 @@
         raise NotImplementedError("Subclass does not define the apply function")
 
+
 class Perfect1D(Resolution):
     """
@@ -57 +55 @@
     def apply(self, theory):
         return theory
+
 
 class Pinhole1D(Resolution):