Changeset 8d62008 in sasmodels for sasmodels/compare.py

Timestamp:

Apr 15, 2016 12:16:41 PM (8 years ago)

Author:

Paul Kienzle <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:

8f6817d

Parents:

3599d36

Message:

remove circular dependency between details/modelinfo; fix compare Calculator type hint

File:

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

sasmodels/compare.py

@@ -49 +49 @@
     from .modelinfo import ModelInfo, Parameter, ParameterSet
     from .data import Data
-    Calculator = Callable[[float, ...], np.ndarray]
+    Calculator = Callable[[float], np.ndarray]
 
 USAGE = """
@@ -383 +383 @@
     # import rather than the more obscure smear_selection not imported error
     import sas
+    import sas.models
     from sas.models.qsmearing import smear_selection
-    import sas.models
+    from sas.models.MultiplicationModel import MultiplicationModel
 
     def get_model(name):
@@ -399 +400 @@
         composition_type, parts = model_info.composition
         if composition_type == 'product':
-            from sas.models.MultiplicationModel import MultiplicationModel
             P, S = [get_model(revert_name(p)) for p in parts]
             model = MultiplicationModel(P, S)