Changeset 85fe7f8 in sasmodels

Timestamp:

Nov 2, 2016 5:58:24 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

8977226

Parents:

fa6d6fc

Message:

re-enable sasview after forward conversion and linting updates

Location:

sasmodels

Files:

• compare.py (modified) (1 diff)
• modelinfo.py (modified) (1 diff)
• sasview_model.py (modified) (3 diffs)

sasmodels/compare.py

@@ -1185 +1185 @@
         # Initialize parameter ranges, fixing the 2D parameters for 1D data.
         if not opts['is2d']:
-            for p in model_info.parameters.user_parameters(is2d=False):
+            for p in model_info.parameters.user_parameters({}, is2d=False):
                 for ext in ['', '_pd', '_pd_n', '_pd_nsigma']:
                     k = p.name+ext

sasmodels/modelinfo.py

@@ -548 +548 @@
         return full_list
 
-    def user_parameters(self, pars=None, is2d=True):
+    def user_parameters(self, pars, is2d=True):
         # type: (Dict[str, float], bool) -> List[Parameter]
         """

sasmodels/sasview_model.py

@@ -50 +50 @@
     """
     import sys
-    import sas
+    import sas   # needed in order to set sas.models
     import sas.sascalc.fit
     sys.modules['sas.models'] = sas.sascalc.fit
@@ -58 +58 @@
     from sasmodels.conversion_table import CONVERSION_TABLE
     for new_name, conversion in CONVERSION_TABLE.items():
+        # CoreShellEllipsoidModel => core_shell_ellipsoid:1
+        new_name = new_name.split(':')[0]
         old_name = conversion[0]
         module_attrs = {old_name: find_model(new_name)}
@@ -228 +230 @@
     magnetic_params = []
     fixed = []
-    for p in model_info.parameters.user_parameters():
+    for p in model_info.parameters.user_parameters({}, is2d=True):
         if p.type == 'orientation':
             orientation_params.append(p.name)