Changeset 8d62008 in sasmodels for sasmodels/modelinfo.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/modelinfo.py (modified) (4 diffs)

sasmodels/modelinfo.py

@@ -13 +13 @@
 
 import numpy as np  # type: ignore
-
-from .details import mono_details
 
 # Optional typing
@@ -22 +20 @@
     pass
 else:
-    from .details import CallDetails
     Limits = Tuple[float, float]
     #LimitsOrChoice = Union[Limits, Tuple[Sequence[str]]]
@@ -658 +655 @@
     info.hidden = getattr(kernel_module, 'hidden', None) # type: ignore
 
-    # Precalculate the monodisperse parameter details
-    info.mono_details = mono_details(info)
     return info
 
@@ -811 +806 @@
     #: the SESANS correlation function.  Note: not currently implemented.
     sesans = None           # type: Optional[Callable[[np.ndarray], np.ndarray]]
-    #: :class:details.CallDetails data for mono-disperse function evaluation.
-    #: This field is created automatically by the model loader, and should
-    #: not be defined as part of the model definition file.
-    mono_details = None     # type: CallDetails
 
     def __init__(self):