Changeset 2f2c70c in sasmodels

Timestamp:

Oct 10, 2016 10:56:09 AM (8 years ago)

Author:

mathieu

Branches:

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

Children:

3a45c2c

Parents:

8f93522

Message:

Fix problem with reloading. Re #673

File:

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

sasmodels/sasview_model.py

@@ -127 +127 @@
         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 +167 @@
     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