Changeset ed10b57 in sasmodels

Timestamp:

Oct 9, 2016 8:35:59 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:

3c852d4, 9f37726

Parents:

3f5a566

Message:

Allow loading of custom model of the same name as a std model (append version). Re #673

File:

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

sasmodels/sasview_model.py

@@ -115 +115 @@
     Load a custom model given the model path.
     """
-    #print("load custom", path)
     kernel_module = custom.load_custom_kernel_module(path)
     try:
@@ -127 +126 @@
         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
+
     MODELS[model.name] = model
     return model