Changeset 689b7c4 in sasmodels for sasmodels/sasview_model.py

Timestamp:

Oct 10, 2016 2:51:17 PM (8 years ago)

Author:

wojciech

Branches:

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

Children:

234c532

Parents:

9f37726 (diff), 20a70bc (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:

wpotrzebowski <Wojciech.Potrzebowski@…> (10/10/16 14:51:07)

git-committer:

wpotrzebowski <Wojciech.Potrzebowski@…> (10/10/16 14:51:17)

Message:

Removing try/except clause that wasn't properly handled

File:

• sasmodels/sasview_model.py (modified) (5 diffs)

sasmodels/sasview_model.py

@@ -123 +123 @@
         if model.name == "":
             model.name = splitext(basename(path))[0]
+        if not hasattr(model, 'filename'):
+            model.filename = kernel_module.__file__
     except AttributeError:
         model_info = modelinfo.make_model_info(kernel_module)
         model = _make_model_from_info(model_info)
 
-    # If we are trying to load a model that already exists,
-    # append a version number to its name.
-    # Note that models appear to be periodically reloaded 
-    # by SasView and keeping track of whether we are reloading 
-    # a model or loading it for the first time is tricky.
-    # For now, just allow one custom model of a given name.
-    if model.name in MODELS:
-        model.name = "%s_v2" % model.name
+    # If a model name already exists and we are loading a different model,
+    # use the model file name as the model name.
+    if model.name in MODELS and not model.filename == MODELS[model.name].filename:
+        _previous_name = model.name
+        model.name = model.id
+        
+        # If the new model name is still in the model list (for instance,
+        # if we put a cylinder.py in our plug-in directory), then append
+        # an identifier.
+        if model.name in MODELS and not model.filename == MODELS[model.name].filename:
+            model.name = model.id + '_user'
+        logging.info("Model %s already exists: using %s [%s]", _previous_name, model.name, model.filename)
 
     MODELS[model.name] = model
@@ -163 +169 @@
     attrs = _generate_model_attributes(model_info)
     attrs['__init__'] = __init__
+    attrs['filename'] = model_info.filename
     ConstructedModel = type(model_info.name, (SasviewModel,), attrs) # type: SasviewModelType
     return ConstructedModel
@@ -320 +327 @@
         else:
             hidden = set()
+        if self._model_info.structure_factor:
+            hidden.add('scale')
+            hidden.add('background')
+            self._model_info.parameters.defaults['background'] = 0.
 
         self._persistency_dict = {}
@@ -665 +676 @@
                 return [self.multiplicity], [1.0]
             else:
-                return [np.NaN], [1.0]
+                # For hidden parameters use the default value.
+                value = self._model_info.parameters.defaults.get(par.name, np.NaN)
+                return [value], [1.0]
         elif par.polydisperse:
             dis = self.dispersion[par.name]
@@ -686 +699 @@
     cylinder = Cylinder()
     return cylinder.evalDistribution([0.1, 0.1])
+
+def test_structure_factor():
+    # type: () -> float
+    """
+    Test that a sasview model (cylinder) can be run.
+    """
+    Model = _make_standard_model('hardsphere')
+    model = Model()
+    value = model.evalDistribution([0.1, 0.1])
+    if np.isnan(value):
+        raise ValueError("hardsphere returns null")
 
 def test_rpa():